diff options
author | Alasdair Nicol <alasdair@memset.com> | 2013-10-18 01:24:41 +0100 |
---|---|---|
committer | Alasdair Nicol <alasdair@memset.com> | 2013-10-18 01:28:32 +0100 |
commit | 65d1d65d52a87bba22845bcb7c3c921a8789ec19 (patch) | |
tree | 872e3bb19d81395d60f13019844a042cb00252f5 /tests | |
parent | dfb4cb9970f86487f0aaa88c5dfcfafa31e4f430 (diff) | |
download | django-65d1d65d52a87bba22845bcb7c3c921a8789ec19.tar.gz |
Fixed #21267 -- Fixed E502 pep8 warnings
Diffstat (limited to 'tests')
-rw-r--r-- | tests/admin_changelist/tests.py | 2 | ||||
-rw-r--r-- | tests/admin_widgets/tests.py | 2 | ||||
-rw-r--r-- | tests/defaultfilters/tests.py | 62 | ||||
-rw-r--r-- | tests/distinct_on_fields/tests.py | 6 |
4 files changed, 36 insertions, 36 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 54a4993171..ec62a02f3b 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -168,7 +168,7 @@ class ChangeListTests(TestCase): m.list_display = ['id', 'name', 'parent'] m.list_display_links = ['id'] m.list_editable = ['name'] - self.assertRaises(IncorrectLookupParameters, lambda: \ + self.assertRaises(IncorrectLookupParameters, lambda: ChangeList(request, Child, m.list_display, m.list_display_links, m.list_filter, m.date_hierarchy, m.search_fields, m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)) diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 3613fa2207..360902cf68 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -54,7 +54,7 @@ class AdminFormfieldForDBFieldTests(TestCase): # Check that we got a field of the right type self.assertTrue( isinstance(widget, widgetclass), - "Wrong widget for %s.%s: expected %s, got %s" % \ + "Wrong widget for %s.%s: expected %s, got %s" % (model.__class__.__name__, fieldname, widgetclass, type(widget)) ) diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py index d51bebcd7d..f347ceef3f 100644 --- a/tests/defaultfilters/tests.py +++ b/tests/defaultfilters/tests.py @@ -124,7 +124,7 @@ class DefaultFiltersTests(TestCase): self.assertEqual(linenumbers('line 1\nline 2'), '1. line 1\n2. line 2') self.assertEqual(linenumbers('\n'.join(['x'] * 10)), - '01. x\n02. x\n03. x\n04. x\n05. x\n06. x\n07. '\ + '01. x\n02. x\n03. x\n04. x\n05. x\n06. x\n07. ' 'x\n08. x\n09. x\n10. x') def test_lower(self): @@ -138,7 +138,7 @@ class DefaultFiltersTests(TestCase): self.assertEqual(make_list(1234), ['1', '2', '3', '4']) def test_slugify(self): - self.assertEqual(slugify(' Jack & Jill like numbers 1,2,3 and 4 and'\ + self.assertEqual(slugify(' Jack & Jill like numbers 1,2,3 and 4 and' ' silly characters ?%.$!/'), 'jack-jill-like-numbers-123-and-4-and-silly-characters') @@ -170,7 +170,7 @@ class DefaultFiltersTests(TestCase): def test_truncatewords_html(self): self.assertEqual(truncatewords_html( '<p>one <a href="#">two - three <br>four</a> five</p>', 0), '') - self.assertEqual(truncatewords_html('<p>one <a href="#">two - '\ + self.assertEqual(truncatewords_html('<p>one <a href="#">two - ' 'three <br>four</a> five</p>', 2), '<p>one <a href="#">two ...</a></p>') self.assertEqual(truncatewords_html( @@ -205,17 +205,17 @@ class DefaultFiltersTests(TestCase): 'fran%C3%A7ois%20%26%20jill') def test_urlizetrunc(self): - self.assertEqual(urlizetrunc('http://short.com/', 20), '<a href='\ + self.assertEqual(urlizetrunc('http://short.com/', 20), '<a href=' '"http://short.com/" rel="nofollow">http://short.com/</a>') - self.assertEqual(urlizetrunc('http://www.google.co.uk/search?hl=en'\ - '&q=some+long+url&btnG=Search&meta=', 20), '<a href="http://'\ - 'www.google.co.uk/search?hl=en&q=some+long+url&btnG=Search&'\ + self.assertEqual(urlizetrunc('http://www.google.co.uk/search?hl=en' + '&q=some+long+url&btnG=Search&meta=', 20), '<a href="http://' + 'www.google.co.uk/search?hl=en&q=some+long+url&btnG=Search&' 'meta=" rel="nofollow">http://www.google...</a>') - self.assertEqual(urlizetrunc('http://www.google.co.uk/search?hl=en'\ - '&q=some+long+url&btnG=Search&meta=', 20), '<a href="http://'\ - 'www.google.co.uk/search?hl=en&q=some+long+url&btnG=Search'\ + self.assertEqual(urlizetrunc('http://www.google.co.uk/search?hl=en' + '&q=some+long+url&btnG=Search&meta=', 20), '<a href="http://' + 'www.google.co.uk/search?hl=en&q=some+long+url&btnG=Search' '&meta=" rel="nofollow">http://www.google...</a>') # Check truncating of URIs which are the exact length @@ -223,15 +223,15 @@ class DefaultFiltersTests(TestCase): self.assertEqual(len(uri), 31) self.assertEqual(urlizetrunc(uri, 31), - '<a href="http://31characteruri.com/test/" rel="nofollow">'\ + '<a href="http://31characteruri.com/test/" rel="nofollow">' 'http://31characteruri.com/test/</a>') self.assertEqual(urlizetrunc(uri, 30), - '<a href="http://31characteruri.com/test/" rel="nofollow">'\ + '<a href="http://31characteruri.com/test/" rel="nofollow">' 'http://31characteruri.com/t...</a>') self.assertEqual(urlizetrunc(uri, 2), - '<a href="http://31characteruri.com/test/"'\ + '<a href="http://31characteruri.com/test/"' ' rel="nofollow">...</a>') def test_urlize(self): @@ -350,18 +350,18 @@ class DefaultFiltersTests(TestCase): self.assertEqual(wordcount('oneword'), 1) self.assertEqual(wordcount('lots of words'), 3) - self.assertEqual(wordwrap('this is a long paragraph of text that '\ + self.assertEqual(wordwrap('this is a long paragraph of text that ' 'really needs to be wrapped I\'m afraid', 14), - "this is a long\nparagraph of\ntext that\nreally needs\nto be "\ + "this is a long\nparagraph of\ntext that\nreally needs\nto be " "wrapped\nI'm afraid") - self.assertEqual(wordwrap('this is a short paragraph of text.\n '\ + self.assertEqual(wordwrap('this is a short paragraph of text.\n ' 'But this line should be indented', 14), - 'this is a\nshort\nparagraph of\ntext.\n But this\nline '\ + 'this is a\nshort\nparagraph of\ntext.\n But this\nline ' 'should be\nindented') - self.assertEqual(wordwrap('this is a short paragraph of text.\n '\ - 'But this line should be indented',15), 'this is a short\n'\ + self.assertEqual(wordwrap('this is a short paragraph of text.\n ' + 'But this line should be indented',15), 'this is a short\n' 'paragraph of\ntext.\n But this line\nshould be\nindented') def test_rjust(self): @@ -388,7 +388,7 @@ class DefaultFiltersTests(TestCase): self.assertIsInstance(escaped, SafeData) self.assertEqual( force_escape('<some html & special characters > here ĐÅ€£'), - '<some html & special characters > here'\ + '<some html & special characters > here' ' \u0110\xc5\u20ac\xa3') def test_linebreaks(self): @@ -409,10 +409,10 @@ class DefaultFiltersTests(TestCase): 'line 1<br />line 2') def test_removetags(self): - self.assertEqual(removetags('some <b>html</b> with <script>alert'\ + self.assertEqual(removetags('some <b>html</b> with <script>alert' '("You smell")</script> disallowed <img /> tags', 'script img'), 'some <b>html</b> with alert("You smell") disallowed tags') - self.assertEqual(striptags('some <b>html</b> with <script>alert'\ + self.assertEqual(striptags('some <b>html</b> with <script>alert' '("You smell")</script> disallowed <img /> tags'), 'some html with alert("You smell") disallowed tags') @@ -483,20 +483,20 @@ class DefaultFiltersTests(TestCase): self.assertEqual( unordered_list(['item 1', ['item 1.1', 'item1.2'], 'item 2']), - '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item1.2'\ + '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item1.2' '</li>\n\t</ul>\n\t</li>\n\t<li>item 2</li>') self.assertEqual( unordered_list(['item 1', ['item 1.1', ['item 1.1.1', ['item 1.1.1.1']]]]), - '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1\n\t\t<ul>\n\t\t\t<li>'\ - 'item 1.1.1\n\t\t\t<ul>\n\t\t\t\t<li>item 1.1.1.1</li>\n\t\t\t'\ + '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1\n\t\t<ul>\n\t\t\t<li>' + 'item 1.1.1\n\t\t\t<ul>\n\t\t\t\t<li>item 1.1.1.1</li>\n\t\t\t' '</ul>\n\t\t\t</li>\n\t\t</ul>\n\t\t</li>\n\t</ul>\n\t</li>') self.assertEqual(unordered_list( ['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]), - '\t<li>States\n\t<ul>\n\t\t<li>Kansas\n\t\t<ul>\n\t\t\t<li>'\ - 'Lawrence</li>\n\t\t\t<li>Topeka</li>\n\t\t</ul>\n\t\t</li>'\ + '\t<li>States\n\t<ul>\n\t\t<li>Kansas\n\t\t<ul>\n\t\t\t<li>' + 'Lawrence</li>\n\t\t\t<li>Topeka</li>\n\t\t</ul>\n\t\t</li>' '\n\t\t<li>Illinois</li>\n\t</ul>\n\t</li>') @python_2_unicode_compatible @@ -518,13 +518,13 @@ class DefaultFiltersTests(TestCase): '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t</ul>\n\t</li>') self.assertEqual(unordered_list(['item 1', [['item 1.1', []], - ['item 1.2', []]]]), '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1'\ + ['item 1.2', []]]]), '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1' '</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>') self.assertEqual(unordered_list(['States', [['Kansas', [['Lawrence', - []], ['Topeka', []]]], ['Illinois', []]]]), '\t<li>States\n\t'\ - '<ul>\n\t\t<li>Kansas\n\t\t<ul>\n\t\t\t<li>Lawrence</li>'\ - '\n\t\t\t<li>Topeka</li>\n\t\t</ul>\n\t\t</li>\n\t\t<li>'\ + []], ['Topeka', []]]], ['Illinois', []]]]), '\t<li>States\n\t' + '<ul>\n\t\t<li>Kansas\n\t\t<ul>\n\t\t\t<li>Lawrence</li>' + '\n\t\t\t<li>Topeka</li>\n\t\t</ul>\n\t\t</li>\n\t\t<li>' 'Illinois</li>\n\t</ul>\n\t</li>') def test_add(self): diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py index 392178d894..5ce3ee4faf 100644 --- a/tests/distinct_on_fields/tests.py +++ b/tests/distinct_on_fields/tests.py @@ -51,15 +51,15 @@ class DistinctOnTests(TestCase): ['<Staff: p1>', '<Staff: p1>', '<Staff: p2>', '<Staff: p3>'], ), ( - Celebrity.objects.filter(fan__in=[self.fan1, self.fan2, self.fan3]).\ + Celebrity.objects.filter(fan__in=[self.fan1, self.fan2, self.fan3]). distinct('name').order_by('name'), ['<Celebrity: c1>', '<Celebrity: c2>'], ), # Does combining querysets work? ( - (Celebrity.objects.filter(fan__in=[self.fan1, self.fan2]).\ + (Celebrity.objects.filter(fan__in=[self.fan1, self.fan2]). distinct('name').order_by('name') - |Celebrity.objects.filter(fan__in=[self.fan3]).\ + |Celebrity.objects.filter(fan__in=[self.fan3]). distinct('name').order_by('name')), ['<Celebrity: c1>', '<Celebrity: c2>'], ), |