Skip to content

Commit 51d24c0

Browse files
committed
pb: fix E302,E251,E301,E303,E305,E306,E231,E261
1 parent 20b6ef1 commit 51d24c0

24 files changed

+160
-62
lines changed

pb/cache.py

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
'label': 'label'
3030
}
3131

32+
3233
def all_urls(paste):
3334
for key, value in _methods.items():
3435
if value in paste:
@@ -38,13 +39,15 @@ def all_urls(paste):
3839
conv = current_app.url_map.converters[key]
3940
yield conv.to_url(None, paste[value], 6)
4041

42+
4143
def get_session():
4244
s = getattr(g, '_session', None)
4345
if s is None:
4446
s = g._session = Session()
4547
s.executor = ThreadPoolExecutor(4)
4648
return s
4749

50+
4851
def invalidate(**kwargs):
4952
cur = model.get_meta(**kwargs)
5053
if not cur or not cur.count():
@@ -64,6 +67,7 @@ def invalidate(**kwargs):
6467

6568
return paste
6669

70+
6771
def add_cache_header(response):
6872
if request.method == 'GET' and not response.cache_control.public:
6973
prefix = request.blueprint if request.blueprint else current_app.name
@@ -78,11 +82,13 @@ def add_cache_header(response):
7882
response.make_conditional(request)
7983
return response
8084

85+
8186
def teardown_cache(exception):
8287
s = getattr(g, '_session', None)
8388
if s is not None:
8489
s.executor.shutdown()
8590

91+
8692
def init_cache(app):
8793
app.teardown_appcontext(teardown_cache)
8894
app.after_request(add_cache_header)

pb/config.py

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
config = {}
55

6+
67
def load_config(app, filename):
78
config.clear()
89
for filename in BaseDirectory.load_config_paths('pb', filename):

pb/converters.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
class UnhexMixin:
2222
def to_url(self, value, length=None):
2323
length = length if length else self.length
24+
2425
def f(v):
25-
v = '{:0>{length}}'.format(v[-(length):], length = length)
26+
v = '{:0>{length}}'.format(v[-(length):], length=length)
2627
return urlsafe_b64encode(unhexlify(v)).decode('utf-8')
2728

2829
if isinstance(value, str):
@@ -31,11 +32,13 @@ def f(v):
3132
ext = path.splitext(filename)[1] if filename else ''
3233
return '{}{}'.format(f(sid), ext)
3334

35+
3436
class SREMixin:
3537
def to_python(self, value):
3638
name, label = self.sre.match(value).groups()
3739
return label, name
3840

41+
3942
class SIDConverter(UnhexMixin, BaseConverter):
4043
def __init__(self, map, length):
4144
super().__init__(map)
@@ -53,6 +56,7 @@ def to_python(self, value):
5356
_hex = None
5457
return _hex, name, value[:4]
5558

59+
5660
class SHA1Converter(UnhexMixin, SREMixin, BaseConverter):
5761
regex = '(([A-Za-z0-9]{40})(?:[.][^/]*)?)'
5862

@@ -61,6 +65,7 @@ def __init__(self, map):
6165
self.sre = re.compile(self.regex)
6266
self.length = 42
6367

68+
6469
class LabelConverter(SREMixin, BaseConverter):
6570
regex = '(((?:~[^/.]+)|(?:[^/.]{1}))(?:[.][^/]*)?)'
6671

@@ -75,6 +80,7 @@ def to_url(self, value, length=None):
7580
ext = path.splitext(filename)[1] if filename else ''
7681
return '{}{}'.format(label, ext)
7782

83+
7884
class NamespaceConverter(LabelConverter):
7985
regex = '(([^/.]*)(?:[.][^/]*)?)'
8086
weight = 120

pb/namespace/model.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,28 @@
1414

1515
from pb.db import get_db
1616

17+
1718
def auth(name, uuid):
1819
ns = get_db().namespaces.find(dict(
19-
name = name,
20-
_id = uuid.hex
20+
name=name,
21+
_id=uuid.hex
2122
))
2223

2324
return ns
2425

26+
2527
def get(name):
2628
ns = get_db().namespaces.find(dict(
27-
name = name
29+
name=name
2830
))
2931

3032
return ns
3133

34+
3235
def create(name):
3336
d = dict(
34-
_id = uuid4().hex,
35-
name = name
37+
_id=uuid4().hex,
38+
name=name
3639
)
3740
get_db().namespaces.insert(d)
3841
return d

pb/namespace/views.py

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
namespace = Blueprint('namespace', __name__)
1919

20+
2021
@namespace.route('/n/<string:namespace>')
2122
def get(namespace):
2223
cur = model.get(namespace)
@@ -28,6 +29,7 @@ def get(namespace):
2829

2930
return NamespaceResponse(namespace, 'exists', code=200)
3031

32+
3133
@namespace.route('/n/<string:namespace>', methods=['POST'])
3234
def post(namespace):
3335
try:

pb/paste/handler.py

+8
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,49 @@
2626
'text/x-rst': rst
2727
}
2828

29+
2930
def render(content, mimetype, partial=False, **kwargs):
3031
renderer = mimetypes.get(mimetype, rst)
3132
content = renderer(content)
3233
if not partial:
3334
content = render_template("generic.html", cc='container-fluid', content=content, **style_args())
3435
return content
3536

37+
3638
options = ['autoPlay', 'loop', 'startAt', 'speed', 'snapshot',
3739
'fontSize', 'theme', 'title', 'author', 'authorURL', 'authorImgURL']
3840

41+
3942
def lazy_int(num):
4043
try:
4144
return int(num)
4245
except ValueError:
4346
return num
4447

48+
4549
def terminal(content, mimetype, path=None, **kwargs):
4650
# FIXME: this is really bad, because the db bothered to give us
4751
# content, and we discard it here.
4852
url = url_for('paste.get', label='{}.json'.format(path))
4953
content = render_template("asciinema.html", url=url)
5054
return content
5155

56+
5257
handlers = {
5358
'r': render,
5459
't': terminal
5560
}
5661

62+
5763
def get(handler, content, mimetype, **kwargs):
5864
h = handlers.get(handler)
5965
if not h:
6066
return StatusResponse({"invalid handler": handler}, 400)
6167
return h(content, mimetype, **kwargs)
6268

6369
# dirtyhack
70+
71+
6472
class HandlerConverter(BaseConverter):
6573
regex = '[{}]'.format(''.join(handlers))
6674
weight = 50

pb/paste/model.py

+23-13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
from pb.db import get_db, get_fs
2020

21+
2122
def _transform(kwargs):
2223
for key, value in kwargs.items():
2324
if not value:
@@ -27,9 +28,11 @@ def _transform(kwargs):
2728
else:
2829
yield key, value
2930

31+
3032
def transform(kwargs):
3133
return dict(_transform(kwargs))
3234

35+
3336
def _put(stream):
3437
b = stream.read()
3538
digest = sha1(b).hexdigest()
@@ -41,56 +44,63 @@ def _put(stream):
4144
# FIXME: what the actual fuck, mitsuhiko?
4245
b = get_fs().put(b)
4346
return dict(
44-
content = b,
45-
digest = digest,
46-
short = digest[-6:],
47-
size = size
47+
content=b,
48+
digest=digest,
49+
short=digest[-6:],
50+
size=size
4851
)
4952

53+
5054
def _get(content):
5155
if isinstance(content, ObjectId):
5256
return get_fs().get(content).read()
5357
return content
5458

59+
5560
def insert(stream, **kwargs):
5661
kwargs.update(**_put(stream))
5762
d = dict(
58-
_id = uuid4().hex,
59-
date = datetime.utcnow(),
63+
_id=uuid4().hex,
64+
date=datetime.utcnow(),
6065
**transform(kwargs)
6166
)
6267
get_db().pastes.insert(d)
6368
return d
6469

70+
6571
def put(stream, mimetype=None, **kwargs):
6672
args = _put(stream)
6773
args.update(mimetype=mimetype)
6874
return get_db().pastes.update(transform(kwargs), {
6975
'$set': transform(args)
7076
})
7177

78+
7279
def delete(**kwargs):
7380
return get_db().pastes.remove(transform(kwargs))
7481

82+
7583
def get_digest(stream=None, content=None):
7684
paste = get_db().pastes.find(dict(
77-
digest = sha1(content if content else stream.read()).hexdigest()
85+
digest=sha1(content if content else stream.read()).hexdigest()
7886
)).sort('date', DESCENDING)
7987
if stream:
8088
stream.seek(0)
8189
return paste
8290

91+
8392
def get_content(**kwargs):
8493
paste = get_db().pastes.find(transform(kwargs), dict(
85-
content = 1,
86-
redirect = 1,
87-
sunset = 1,
88-
date = 1,
89-
_id = 1,
90-
mimetype = 1
94+
content=1,
95+
redirect=1,
96+
sunset=1,
97+
date=1,
98+
_id=1,
99+
mimetype=1
91100
)).sort('date', DESCENDING)
92101
return paste
93102

103+
94104
def get_meta(**kwargs):
95105
return get_db().pastes.find(
96106
transform(kwargs)

0 commit comments

Comments
 (0)