misc: apply double-quote-string-fixer (#79788)

This commit is contained in:
Valentin Deniaud 2023-08-16 10:31:35 +02:00
parent c3534c25bf
commit 1684993755
4 changed files with 25 additions and 25 deletions

View File

@ -27,14 +27,14 @@ def list2human(stringlist):
'''Transform a string list to human enumeration'''
beginning = stringlist[:-1]
if not beginning:
return "".join(stringlist)
return _("%(first)s and %(second)s") % {'first': _(", ").join(beginning), 'second': stringlist[-1]}
return ''.join(stringlist)
return _('%(first)s and %(second)s') % {'first': _(', ').join(beginning), 'second': stringlist[-1]}
def seconds2humanduration(seconds, short=False):
"""Convert a time range in seconds to a human string representation"""
if not isinstance(seconds, int):
return ""
return ''
days = int(seconds / _day)
seconds = seconds - _day * days

View File

@ -4,7 +4,7 @@ DATABASES = {
'default': {
'ENGINE': os.environ.get('DB_ENGINE', 'django.db.backends.postgresql_psycopg2'),
'NAME': 'publik-django-templatetags-test-%s'
% os.environ.get("BRANCH_NAME", "").replace('/', '-')[:45],
% os.environ.get('BRANCH_NAME', '').replace('/', '-')[:45],
}
}
@ -51,12 +51,12 @@ REQUESTS_TIMEOUT = 25
DEBUG = True
USE_TZ = True
INSTALLED_APPS = [
"django.contrib.auth",
"django.contrib.contenttypes",
"django.contrib.sites",
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sites',
]
STATIC_URL = "/static/"
STATIC_URL = '/static/'
SITE_ID = 1
MIDDLEWARE_CLASSES = ()
LOGGING = {}
SECRET_KEY = "yay"
SECRET_KEY = 'yay'

View File

@ -178,8 +178,8 @@ def test_add():
# using strings
assert tmpl.render(Context({'term1': '1.1', 'term2': 0})) == '1.1'
assert tmpl.render(Context({'term1': 'not a number', 'term2': 1.2})) == ''
assert tmpl.render(Context({'term1': 0.3, 'term2': "1"})) == '1.3'
assert tmpl.render(Context({'term1': 1.4, 'term2': "not a number"})) == ''
assert tmpl.render(Context({'term1': 0.3, 'term2': '1'})) == '1.3'
assert tmpl.render(Context({'term1': 1.4, 'term2': 'not a number'})) == ''
# add
assert tmpl.render(Context({'term1': 4, 'term2': -0.9})) == '3.1'

View File

@ -80,7 +80,7 @@ def test_objects(mock_send, settings, context, nocache):
# test filters evaluation
t = Template('{% for card in cards|objects:"foo" %}{{ card.id }} {% endfor %}')
assert t.render(context) == "1 2 "
assert t.render(context) == '1 2 '
assert mock_send.call_args_list[0][0][0].url.startswith(
'http://127.0.0.1:8999/api/cards/foo/list?'
) # primary service
@ -248,27 +248,27 @@ def test_errors(mock_send, context, nocache):
mock_resp = Response()
mock_resp.status_code = 500
requests_get.return_value = mock_resp
assert t.render(context) == "[]"
assert t.render(context) == '[]'
with mock.patch('publik_django_templatetags.wcs.context_processors.requests.get') as requests_get:
requests_get.side_effect = ConnectionError()
requests_get.return_value = mock_resp
assert t.render(context) == "[]"
assert t.render(context) == '[]'
with mock.patch('publik_django_templatetags.wcs.context_processors.requests.get') as requests_get:
mock_resp = Response()
mock_resp.status_code = 404
requests_get.return_value = mock_resp
assert t.render(context) == "[]"
assert t.render(context) == '[]'
mock_send.side_effect = lambda *a, **k: MockedRequestResponse(content=json.dumps({'err': 1}))
assert t.render(context) == "[]"
assert t.render(context) == '[]'
mock_send.side_effect = lambda *a, **k: MockedRequestResponse(content=json.dumps({}))
assert t.render(context) == "[]"
assert t.render(context) == '[]'
mock_send.side_effect = lambda *a, **k: MockedRequestResponse(content=json.dumps({'data': None}))
assert t.render(context) == "[]"
assert t.render(context) == '[]'
@mock.patch('requests.Session.send', side_effect=mocked_requests_send)
@ -333,11 +333,11 @@ def test_access_control(mock_send, context, nocache):
@mock.patch('requests.Session.send', side_effect=mocked_requests_send)
def test_count(mock_send, context, nocache):
t = Template('{{ cards|objects:"foo"|count }}')
assert t.render(context) == "2"
assert t.render(context) == '2'
context = Context({'foo': None})
t = Template('{{ foo|count }}')
assert t.render(context) == "0"
assert t.render(context) == '0'
OPERATORS = [
@ -625,22 +625,22 @@ def test_filter_by_distance(mock_send, context, nocache):
def test_getlist(mock_send, context, nocache):
t = Template('{% for v in cards|objects:"foo"|getlist:"id" %}{{ v }},{% endfor %}')
t.render(context)
assert t.render(context) == "1,2,"
assert t.render(context) == '1,2,'
t = Template('{% for v in cards|objects:"foo"|getlist:"fields" %}{{ v }},{% endfor %}')
t.render(context)
result = t.render(context)
if ''' in result:
# django 2.2
assert result == "{'foo': 'bar'},{'foo': 'baz'},"
assert result == '{'foo': 'bar'},{'foo': 'baz'},'
else:
# django 3.2
assert result == "{'foo': 'bar'},{'foo': 'baz'},"
assert result == '{'foo': 'bar'},{'foo': 'baz'},'
t = Template('{% for v in cards|objects:"foo"|getlist:"fields"|getlist:"foo" %}{{ v }},{% endfor %}')
t.render(context)
assert t.render(context) == "bar,baz,"
assert t.render(context) == 'bar,baz,'
t = Template('{% for v in cards|objects:"foo"|getlist:"fields"|getlist:"unknown" %}{{ v }},{% endfor %}')
t.render(context)
assert t.render(context) == "None,None,"
assert t.render(context) == 'None,None,'
@mock.patch('requests.Session.send', side_effect=mocked_requests_send)