diff --git a/axes/tests/test_utils.py b/axes/tests/test_utils.py index b880cbe..277c21b 100644 --- a/axes/tests/test_utils.py +++ b/axes/tests/test_utils.py @@ -9,6 +9,11 @@ from django.utils import six from axes.utils import iso8601, is_ipv6, get_client_str, get_client_username +def get_expected_client_str(*args, **kwargs): + client_str_template = '{{user: "{0}", ip: "{1}", user-agent: "{2}", path: "{3}"}}' + return client_str_template.format(*args, **kwargs) + + class UtilsTest(TestCase): def test_iso8601(self): """Tests iso8601 correctly translates datetime.timdelta to ISO 8601 @@ -46,8 +51,7 @@ class UtilsTest(TestCase): user_agent = 'Googlebot/2.1 (+http://www.googlebot.com/bot.html)' path_info = '/admin/' - details = "{{user: '{0}', ip: '{1}', user-agent: '{2}', path: '{3}'}}" - expected = details.format(username, ip, user_agent, path_info) + expected = get_expected_client_str(username, ip, user_agent, path_info) actual = get_client_str(username, ip, user_agent, path_info) self.assertEqual(expected, actual) @@ -72,8 +76,7 @@ class UtilsTest(TestCase): user_agent = 'Googlebot/2.1 (+http://www.googlebot.com/bot.html)' path_info = '/admin/' - details = "{{user: '{0}', ip: '{1}', user-agent: '{2}', path: '{3}'}}" - expected = details.format(username, ip, user_agent, path_info) + expected = get_expected_client_str(username, ip, user_agent, path_info) actual = get_client_str(username, ip, user_agent, path_info) self.assertEqual(expected, actual) @@ -99,8 +102,7 @@ class UtilsTest(TestCase): user_agent = 'Googlebot/2.1 (+http://www.googlebot.com/bot.html)' path_info = '/admin/' - details = "{{user: '{0}', ip: '{1}', user-agent: '{2}', path: '{3}'}}" - expected = details.format(username, ip, user_agent, path_info) + expected = get_expected_client_str(username, ip, user_agent, path_info) actual = get_client_str(username, ip, user_agent, path_info) self.assertEqual(expected, actual) @@ -126,8 +128,7 @@ class UtilsTest(TestCase): user_agent = 'Googlebot/2.1 (+http://www.googlebot.com/bot.html)' path_info = '/admin/' - details = "{{user: '{0}', ip: '{1}', user-agent: '{2}', path: '{3}'}}" - expected = details.format(username, ip, user_agent, path_info) + expected = get_expected_client_str(username, ip, user_agent, path_info) actual = get_client_str(username, ip, user_agent, path_info) self.assertEqual(expected, actual) diff --git a/axes/utils.py b/axes/utils.py index f98c024..eb6a83b 100644 --- a/axes/utils.py +++ b/axes/utils.py @@ -41,7 +41,7 @@ def get_client_str(username, ip_address, user_agent=None, path_info=None): if settings.AXES_VERBOSE: if isinstance(path_info, tuple): path_info = path_info[0] - details = "{{user: '{0}', ip: '{1}', user-agent: '{2}', path: '{3}'}}" + details = '{{user: "{0}", ip: "{1}", user-agent: "{2}", path: "{3}"}}' return details.format(username, ip_address, user_agent, path_info) if settings.AXES_ONLY_USER_FAILURES: diff --git a/manage.py b/manage.py index 154db24..9ce901e 100644 --- a/manage.py +++ b/manage.py @@ -1,9 +1,10 @@ #!/usr/bin/env python + import os import sys -if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "axes.test_settings") +if __name__ == '__main__': + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'axes.test_settings') from django.core.management import execute_from_command_line