From d55a1e5809b424907528af42bfdfc2991ef11651 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 3 Feb 2022 11:20:46 +0100 Subject: [4.0.x] Refs #33476 -- Refactored problematic code before reformatting by Black. In these cases Black produces unexpected results, e.g. def make_random_password( self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyz' 'ABCDEFGHJKLMNPQRSTUVWXYZ' '23456789', ): or cursor.execute(""" SELECT ... """, [table name], ) Backport of c5cd8783825b5f6384417dac5f3889b4210b7d08 from main. --- tests/template_tests/filter_tests/test_urlizetrunc.py | 7 +++---- tests/template_tests/syntax_tests/i18n/test_get_language_info.py | 2 +- tests/template_tests/test_custom.py | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/template_tests') diff --git a/tests/template_tests/filter_tests/test_urlizetrunc.py b/tests/template_tests/filter_tests/test_urlizetrunc.py index e37e277212..09bbe776cf 100644 --- a/tests/template_tests/filter_tests/test_urlizetrunc.py +++ b/tests/template_tests/filter_tests/test_urlizetrunc.py @@ -60,14 +60,13 @@ class FunctionTests(SimpleTestCase): self.assertEqual( urlizetrunc(uri, 1), - '', + '', ) def test_overtruncate(self): self.assertEqual( - urlizetrunc('http://short.com/', 20), 'http://short.com/', + urlizetrunc('http://short.com/', 20), + 'http://short.com/', ) def test_query_string(self): diff --git a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py index 51e8d2bc79..4ae8186af5 100644 --- a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py +++ b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py @@ -36,7 +36,7 @@ class I18nGetLanguageInfoTagTests(SimpleTestCase): output = self.engine.render_to_string('i18n38') self.assertEqual(output, 'de: German/Deutsch/německy bidi=False') - @setup({'template': '{% load i18n %}''{% get_language_info %}'}) + @setup({'template': '{% load i18n %}{% get_language_info %}'}) def test_no_for_as(self): msg = "'get_language_info' requires 'for string as variable' (got [])" with self.assertRaisesMessage(TemplateSyntaxError, msg): diff --git a/tests/template_tests/test_custom.py b/tests/template_tests/test_custom.py index cade3e4610..59f83d80e2 100644 --- a/tests/template_tests/test_custom.py +++ b/tests/template_tests/test_custom.py @@ -104,8 +104,7 @@ class SimpleTagTests(TagTestCase): ( "'simple_keyword_only_param' received multiple values for " "keyword argument 'kwarg'", - '{% load custom %}{% simple_keyword_only_param kwarg=42 ' - 'kwarg=37 %}', + '{% load custom %}{% simple_keyword_only_param kwarg=42 kwarg=37 %}', ), ( "'simple_keyword_only_default' received multiple values for " -- cgit v1.3