entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

misc: apply black 22.1.0

This commit is contained in:
Frédéric Péters 2022-03-01 19:45:06 +01:00
parent a4e728b109
commit 877155f01d
8 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_misc.py
View File

@ -48,15 +48,15 @@ def teardown_module(module):
def test_parse_file_size():
assert FileSizeWidget.parse_file_size('17') == 17
assert FileSizeWidget.parse_file_size('17o') == 17
assert FileSizeWidget.parse_file_size('17 K') == 17 * 10 ** 3
assert FileSizeWidget.parse_file_size('17 M') == 17 * 10 ** 6
assert FileSizeWidget.parse_file_size('17 Mo') == 17 * 10 ** 6
assert FileSizeWidget.parse_file_size('17 MB') == 17 * 10 ** 6
assert FileSizeWidget.parse_file_size('17 Kio') == 17 * 2 ** 10
assert FileSizeWidget.parse_file_size('17 Mio') == 17 * 2 ** 20
assert FileSizeWidget.parse_file_size('17K') == 17 * 10 ** 3
assert FileSizeWidget.parse_file_size('17 K') == 17 * 10 ** 3
assert FileSizeWidget.parse_file_size(' 17 K ') == 17 * 10 ** 3
assert FileSizeWidget.parse_file_size('17 K') == 17 * 10**3
assert FileSizeWidget.parse_file_size('17 M') == 17 * 10**6
assert FileSizeWidget.parse_file_size('17 Mo') == 17 * 10**6
assert FileSizeWidget.parse_file_size('17 MB') == 17 * 10**6
assert FileSizeWidget.parse_file_size('17 Kio') == 17 * 2**10
assert FileSizeWidget.parse_file_size('17 Mio') == 17 * 2**20
assert FileSizeWidget.parse_file_size('17K') == 17 * 10**3
assert FileSizeWidget.parse_file_size('17 K') == 17 * 10**3
assert FileSizeWidget.parse_file_size(' 17 K ') == 17 * 10**3
def test_parse_invalid_file_size():

2
wcs/api.py
View File

@ -980,7 +980,7 @@ class ApiUserDirectory(Directory):
else:
return HttpResponseBadRequest('invalid status parameter value')
typed_none = time.gmtime(-(10 ** 10))
typed_none = time.gmtime(-(10**10))
user_forms.sort(key=lambda x: x.receipt_time or typed_none)
if get_request().form.get('sort') == 'desc':
user_forms.reverse()

15
wcs/backoffice/management.py
View File

@ -1965,7 +1965,7 @@ class FormPage(Directory):
# cast to integer so it can be used with numerical operators
# (limit to 32bits to match postgresql integer range)
int_filter_field_value = int(filter_field_value)
if -(2 ** 31) <= int_filter_field_value < 2 ** 31:
if -(2**31) <= int_filter_field_value < 2**31:
filter_field_value = int_filter_field_value
except (ValueError, TypeError):
filter_field_value = str(filter_field_value)
@ -2017,14 +2017,11 @@ class FormPage(Directory):
unknown_filters = sorted(filters_in_request - known_filters)
if unknown_filters:
error_message = (
ngettext(
'Invalid filter "%(filters)s"',
'Invalid filters "%(filters)s"',
len(unknown_filters),
)
% {'filters': _('", "').join(f for f in unknown_filters)}
)
error_message = ngettext(
'Invalid filter "%(filters)s"',
'Invalid filters "%(filters)s"',
len(unknown_filters),
) % {'filters': _('", "').join(f for f in unknown_filters)}
report_error(error_message)
if custom_view is not None:
for unknown_filter in unknown_filters:

13
wcs/backoffice/submission.py
View File

@ -453,14 +453,11 @@ class SubmissionDirectory(Directory):
if not list_content.getvalue().strip():
continue
empty = False
r += (
htmltext('<h2>%s</h2>')
% {
'create': _('New submission'),
'existing': _('Running submission'),
'empty': _('Submission to complete'),
}.get(mode)
)
r += htmltext('<h2>%s</h2>') % {
'create': _('New submission'),
'existing': _('Running submission'),
'empty': _('Submission to complete'),
}.get(mode)
r += htmltext('<ul class="biglist">')
r += htmltext(list_content.getvalue())
r += htmltext('</ul>')

2
wcs/carddef.py
View File

@ -224,7 +224,7 @@ class CardDef(FormDef):
criterias.append(ElementILike('digests', digest_key, query))
if get_by_id:
try:
if int(get_by_id) >= 2 ** 31:
if int(get_by_id) >= 2**31:
# out of range for postgresql integer type; would raise
# DataError.
return []

12
wcs/qommon/form.py
View File

@ -1660,12 +1660,12 @@ class FileSizeWidget(ValidatedStringWidget):
except AttributeError: # None has no .groups()
raise ValueError()
coeffs = {
'Mi': 2 ** 20,
'Ki': 2 ** 10,
'ki': 2 ** 10,
'M': 10 ** 6,
'K': 10 ** 3,
'k': 10 ** 3,
'Mi': 2**20,
'Ki': 2**10,
'ki': 2**10,
'M': 10**6,
'K': 10**3,
'k': 10**3,
None: 1,
}
return int(value) * coeffs.get(unit)

4
wcs/qommon/storage.py
View File

@ -151,7 +151,7 @@ class Criteria:
elif isinstance(self.value, (int, float)):
self.typed_none = -sys.maxsize
elif isinstance(self.value, time.struct_time):
self.typed_none = time.gmtime(-(10 ** 10)) # 1653
self.typed_none = time.gmtime(-(10**10)) # 1653
self.field = kwargs.get('field')
def build_lambda(self):
@ -452,7 +452,7 @@ class StorableObject:
key_function = lambda x: simplify(x.name)
elif order_by.endswith('_time'):
typed_none = time.gmtime(-(10 ** 10)) # 1653
typed_none = time.gmtime(-(10**10)) # 1653
key_function = lambda x: getattr(x, order_by) or typed_none
else:
key_function = lambda x: getattr(x, order_by)

1
wcs/wf/export_to_model.py
View File

@ -124,7 +124,6 @@ try:
finally:
shutil.rmtree(temp_dir)
except subprocess.CalledProcessError:
transform_to_pdf = None