From c347f78cc1b2a06958f692f0622deceac534dc6b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 3 Nov 2013 10:08:55 -0800 Subject: Fixed all E226 violations --- tests/admin_filters/tests.py | 2 +- tests/aggregation_regress/tests.py | 8 +++--- tests/bulk_create/tests.py | 8 +++--- tests/cache/tests.py | 8 +++--- tests/defaultfilters/tests.py | 36 ++++++++++++------------- tests/expressions/tests.py | 2 +- tests/forms_tests/tests/test_fields.py | 4 +-- tests/lookup/tests.py | 28 ++++++++++---------- tests/requests/tests.py | 2 +- tests/sites_framework/tests.py | 6 ++--- tests/utils_tests/test_timesince.py | 48 +++++++++++++++++----------------- 11 files changed, 76 insertions(+), 76 deletions(-) (limited to 'tests') diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py index bbec124d4d..8f379245a6 100644 --- a/tests/admin_filters/tests.py +++ b/tests/admin_filters/tests.py @@ -61,7 +61,7 @@ class DecadeListFilterWithNoneReturningLookups(DecadeListFilterWithTitleAndParam class DecadeListFilterWithFailingQueryset(DecadeListFilterWithTitleAndParameter): def queryset(self, request, queryset): - raise 1/0 + raise 1 / 0 class DecadeListFilterWithQuerysetBasedLookups(DecadeListFilterWithTitleAndParameter): diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index be42a13181..dc3d3e2e46 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -346,7 +346,7 @@ class AggregationTests(TestCase): def test_aggregate_fexpr(self): # Aggregates can be used with F() expressions # ... where the F() is pushed into the HAVING clause - qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_books__lt=F('num_awards') / 2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 1, 'name': 'Morgan Kaufmann', 'num_awards': 9}, @@ -355,7 +355,7 @@ class AggregationTests(TestCase): lambda p: p, ) - qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards') / 2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 2, 'name': 'Apress', 'num_awards': 3}, @@ -366,7 +366,7 @@ class AggregationTests(TestCase): ) # ... and where the F() references an aggregate - qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_awards__gt=2*F('num_books')).order_by('name').values('name', 'num_books', 'num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_awards__gt=2 * F('num_books')).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 1, 'name': 'Morgan Kaufmann', 'num_awards': 9}, @@ -375,7 +375,7 @@ class AggregationTests(TestCase): lambda p: p, ) - qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards') / 2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 2, 'name': 'Apress', 'num_awards': 3}, diff --git a/tests/bulk_create/tests.py b/tests/bulk_create/tests.py index dada5326c9..9bb95acb72 100644 --- a/tests/bulk_create/tests.py +++ b/tests/bulk_create/tests.py @@ -94,7 +94,7 @@ class BulkCreateTests(TestCase): with override_settings(DEBUG=True): connection.queries = [] TwoFields.objects.bulk_create([ - TwoFields(f1=i, f2=i+1) for i in range(0, 1001) + TwoFields(f1=i, f2=i + 1) for i in range(0, 1001) ]) self.assertEqual(TwoFields.objects.count(), 1001) self.assertEqual( @@ -115,7 +115,7 @@ class BulkCreateTests(TestCase): with override_settings(DEBUG=True): connection.queries = [] TwoFields.objects.bulk_create([ - TwoFields(f1=i, f2=i+1) for i in range(0, 1001) + TwoFields(f1=i, f2=i + 1) for i in range(0, 1001) ]) self.assertTrue(len(connection.queries) < 10) @@ -127,7 +127,7 @@ class BulkCreateTests(TestCase): with override_settings(DEBUG=True): connection.queries = [] TwoFields.objects.bulk_create([ - TwoFields(id=i if i % 2 == 0 else None, f1=i, f2=i+1) + TwoFields(id=i if i % 2 == 0 else None, f1=i, f2=i + 1) for i in range(100000, 101000)]) self.assertEqual(TwoFields.objects.count(), 1000) # We can't assume much about the ID's created, except that the above @@ -145,7 +145,7 @@ class BulkCreateTests(TestCase): with override_settings(DEBUG=True): connection.queries = [] TwoFields.objects.bulk_create([ - TwoFields(id=i if i % 2 == 0 else None, f1=i, f2=i+1) + TwoFields(id=i if i % 2 == 0 else None, f1=i, f2=i + 1) for i in range(100000, 101000)]) self.assertTrue(len(connection.queries) < 10) diff --git a/tests/cache/tests.py b/tests/cache/tests.py index a93ed4418a..053ee14a58 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -436,13 +436,13 @@ class BaseCacheTests(object): it is an absolute expiration timestamp instead of a relative offset. Test that we honour this convention. Refs #12399. ''' - self.cache.set('key1', 'eggs', 60*60*24*30 + 1) # 30 days + 1 second + self.cache.set('key1', 'eggs', 60 * 60 * 24 * 30 + 1) # 30 days + 1 second self.assertEqual(self.cache.get('key1'), 'eggs') - self.cache.add('key2', 'ham', 60*60*24*30 + 1) + self.cache.add('key2', 'ham', 60 * 60 * 24 * 30 + 1) self.assertEqual(self.cache.get('key2'), 'ham') - self.cache.set_many({'key3': 'sausage', 'key4': 'lobster bisque'}, 60*60*24*30 + 1) + self.cache.set_many({'key3': 'sausage', 'key4': 'lobster bisque'}, 60 * 60 * 24 * 30 + 1) self.assertEqual(self.cache.get('key3'), 'sausage') self.assertEqual(self.cache.get('key4'), 'lobster bisque') @@ -1000,7 +1000,7 @@ class LocMemCacheTests(unittest.TestCase, BaseCacheTests): """incr/decr does not modify expiry time (matches memcached behavior)""" key = 'value' _key = self.cache.make_key(key) - self.cache.set(key, 1, timeout=self.cache.default_timeout*10) + self.cache.set(key, 1, timeout=self.cache.default_timeout * 10) expire = self.cache._expire_info[_key] self.cache.incr(key) self.assertEqual(expire, self.cache._expire_info[_key]) diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py index 3e785a8c70..52a61a1ac7 100644 --- a/tests/defaultfilters/tests.py +++ b/tests/defaultfilters/tests.py @@ -613,15 +613,15 @@ class DefaultFiltersTests(TestCase): # NOTE: \xa0 avoids wrapping between value and unit self.assertEqual(filesizeformat(1023), '1023\xa0bytes') self.assertEqual(filesizeformat(1024), '1.0\xa0KB') - self.assertEqual(filesizeformat(10*1024), '10.0\xa0KB') - self.assertEqual(filesizeformat(1024*1024-1), '1024.0\xa0KB') - self.assertEqual(filesizeformat(1024*1024), '1.0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*50), '50.0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*1024-1), '1024.0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*1024), '1.0\xa0GB') - self.assertEqual(filesizeformat(1024*1024*1024*1024), '1.0\xa0TB') - self.assertEqual(filesizeformat(1024*1024*1024*1024*1024), '1.0\xa0PB') - self.assertEqual(filesizeformat(1024*1024*1024*1024*1024*2000), + self.assertEqual(filesizeformat(10 * 1024), '10.0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024 - 1), '1024.0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024), '1.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 50), '50.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 - 1), '1024.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024), '1.0\xa0GB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024), '1.0\xa0TB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024), '1.0\xa0PB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024 * 2000), '2000.0\xa0PB') self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0bytes') self.assertEqual(filesizeformat(""), '0\xa0bytes') @@ -680,16 +680,16 @@ class DefaultFiltersI18NTests(TransRealMixin, TestCase): with self.settings(USE_L10N=True), translation.override('de', deactivate=True): self.assertEqual(filesizeformat(1023), '1023\xa0Bytes') self.assertEqual(filesizeformat(1024), '1,0\xa0KB') - self.assertEqual(filesizeformat(10*1024), '10,0\xa0KB') - self.assertEqual(filesizeformat(1024*1024-1), '1024,0\xa0KB') - self.assertEqual(filesizeformat(1024*1024), '1,0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*50), '50,0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*1024-1), '1024,0\xa0MB') - self.assertEqual(filesizeformat(1024*1024*1024), '1,0\xa0GB') - self.assertEqual(filesizeformat(1024*1024*1024*1024), '1,0\xa0TB') - self.assertEqual(filesizeformat(1024*1024*1024*1024*1024), + self.assertEqual(filesizeformat(10 * 1024), '10,0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024 - 1), '1024,0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024), '1,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 50), '50,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 - 1), '1024,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024), '1,0\xa0GB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024), '1,0\xa0TB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024), '1,0\xa0PB') - self.assertEqual(filesizeformat(1024*1024*1024*1024*1024*2000), + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024 * 2000), '2000,0\xa0PB') self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0Bytes') self.assertEqual(filesizeformat(""), '0\xa0Bytes') diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 23d729ffee..99f41024f8 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -74,7 +74,7 @@ class ExpressionsTests(TestCase): # We can perform arithmetic operations in expressions # Make sure we have 2 spare chairs - company_query.update(num_chairs=F("num_employees")+2) + company_query.update(num_chairs=F("num_employees") + 2) self.assertQuerysetEqual( company_query, [ { diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py index e7412b81d7..d7eb86f399 100644 --- a/tests/forms_tests/tests/test_fields.py +++ b/tests/forms_tests/tests/test_fields.py @@ -760,11 +760,11 @@ class FieldsTests(SimpleTestCase): def test_url_regex_ticket11198(self): f = URLField() # hangs "forever" if catastrophic backtracking in ticket:#11198 not fixed - self.assertRaisesMessage(ValidationError, "'Enter a valid URL.'", f.clean, 'http://%s' % ("X"*200,)) + self.assertRaisesMessage(ValidationError, "'Enter a valid URL.'", f.clean, 'http://%s' % ("X" * 200,)) # a second test, to make sure the problem is really addressed, even on # domains that don't fail the domain label length check in the regex - self.assertRaisesMessage(ValidationError, "'Enter a valid URL.'", f.clean, 'http://%s' % ("X"*60,)) + self.assertRaisesMessage(ValidationError, "'Enter a valid URL.'", f.clean, 'http://%s' % ("X" * 60,)) def test_urlfield_2(self): f = URLField(required=False) diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py index 0e23933c52..f5e0b744de 100644 --- a/tests/lookup/tests.py +++ b/tests/lookup/tests.py @@ -283,26 +283,26 @@ class LookupTests(TestCase): Article.objects.extra(select={'id_plus_one': 'id+1'}) .order_by('id').values_list('id_plus_one', 'id'), [ - (self.a1.id+1, self.a1.id), - (self.a2.id+1, self.a2.id), - (self.a3.id+1, self.a3.id), - (self.a4.id+1, self.a4.id), - (self.a5.id+1, self.a5.id), - (self.a6.id+1, self.a6.id), - (self.a7.id+1, self.a7.id) + (self.a1.id + 1, self.a1.id), + (self.a2.id + 1, self.a2.id), + (self.a3.id + 1, self.a3.id), + (self.a4.id + 1, self.a4.id), + (self.a5.id + 1, self.a5.id), + (self.a6.id + 1, self.a6.id), + (self.a7.id + 1, self.a7.id) ], transform=identity) self.assertQuerysetEqual( Article.objects.extra(select={'id_plus_one': 'id+1'}) .order_by('id').values_list('id', 'id_plus_one'), [ - (self.a1.id, self.a1.id+1), - (self.a2.id, self.a2.id+1), - (self.a3.id, self.a3.id+1), - (self.a4.id, self.a4.id+1), - (self.a5.id, self.a5.id+1), - (self.a6.id, self.a6.id+1), - (self.a7.id, self.a7.id+1) + (self.a1.id, self.a1.id + 1), + (self.a2.id, self.a2.id + 1), + (self.a3.id, self.a3.id + 1), + (self.a4.id, self.a4.id + 1), + (self.a5.id, self.a5.id + 1), + (self.a6.id, self.a6.id + 1), + (self.a7.id, self.a7.id + 1) ], transform=identity) self.assertQuerysetEqual( diff --git a/tests/requests/tests.py b/tests/requests/tests.py index c00f5bb5e0..2a69638260 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -162,7 +162,7 @@ class RequestsTests(SimpleTestCase): response.set_cookie('max_age', max_age=10) max_age_cookie = response.cookies['max_age'] self.assertEqual(max_age_cookie['max-age'], 10) - self.assertEqual(max_age_cookie['expires'], cookie_date(time.time()+10)) + self.assertEqual(max_age_cookie['expires'], cookie_date(time.time() + 10)) def test_httponly_cookie(self): response = HttpResponse() diff --git a/tests/sites_framework/tests.py b/tests/sites_framework/tests.py index ee25036aae..fb62c28c14 100644 --- a/tests/sites_framework/tests.py +++ b/tests/sites_framework/tests.py @@ -9,7 +9,7 @@ from .models import (SyndicatedArticle, ExclusiveArticle, CustomArticle, class SitesFrameworkTestCase(TestCase): def setUp(self): Site.objects.get_or_create(id=settings.SITE_ID, domain="example.com", name="example.com") - Site.objects.create(id=settings.SITE_ID+1, domain="example2.com", name="example2.com") + Site.objects.create(id=settings.SITE_ID + 1, domain="example2.com", name="example2.com") def test_site_fk(self): article = ExclusiveArticle.objects.create(title="Breaking News!", site_id=settings.SITE_ID) @@ -18,9 +18,9 @@ class SitesFrameworkTestCase(TestCase): def test_sites_m2m(self): article = SyndicatedArticle.objects.create(title="Fresh News!") article.sites.add(Site.objects.get(id=settings.SITE_ID)) - article.sites.add(Site.objects.get(id=settings.SITE_ID+1)) + article.sites.add(Site.objects.get(id=settings.SITE_ID + 1)) article2 = SyndicatedArticle.objects.create(title="More News!") - article2.sites.add(Site.objects.get(id=settings.SITE_ID+1)) + article2.sites.add(Site.objects.get(id=settings.SITE_ID + 1)) self.assertEqual(SyndicatedArticle.on_site.all().get(), article) def test_custom_named_field(self): diff --git a/tests/utils_tests/test_timesince.py b/tests/utils_tests/test_timesince.py index 5814a7cb90..376e425a88 100644 --- a/tests/utils_tests/test_timesince.py +++ b/tests/utils_tests/test_timesince.py @@ -28,28 +28,28 @@ class TimesinceTests(unittest.TestCase): def test_ignore_microseconds_and_seconds(self): """ Microseconds and seconds are ignored. """ - self.assertEqual(timesince(self.t, self.t+self.onemicrosecond), + self.assertEqual(timesince(self.t, self.t + self.onemicrosecond), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t+self.onesecond), + self.assertEqual(timesince(self.t, self.t + self.onesecond), '0\xa0minutes') def test_other_units(self): """ Test other units. """ - self.assertEqual(timesince(self.t, self.t+self.oneminute), + self.assertEqual(timesince(self.t, self.t + self.oneminute), '1\xa0minute') - self.assertEqual(timesince(self.t, self.t+self.onehour), '1\xa0hour') - self.assertEqual(timesince(self.t, self.t+self.oneday), '1\xa0day') - self.assertEqual(timesince(self.t, self.t+self.oneweek), '1\xa0week') - self.assertEqual(timesince(self.t, self.t+self.onemonth), + self.assertEqual(timesince(self.t, self.t + self.onehour), '1\xa0hour') + self.assertEqual(timesince(self.t, self.t + self.oneday), '1\xa0day') + self.assertEqual(timesince(self.t, self.t + self.oneweek), '1\xa0week') + self.assertEqual(timesince(self.t, self.t + self.onemonth), '1\xa0month') - self.assertEqual(timesince(self.t, self.t+self.oneyear), '1\xa0year') + self.assertEqual(timesince(self.t, self.t + self.oneyear), '1\xa0year') def test_multiple_units(self): """ Test multiple units. """ self.assertEqual(timesince(self.t, - self.t+2*self.oneday+6*self.onehour), '2\xa0days, 6\xa0hours') + self.t + 2 * self.oneday + 6 * self.onehour), '2\xa0days, 6\xa0hours') self.assertEqual(timesince(self.t, - self.t+2*self.oneweek+2*self.oneday), '2\xa0weeks, 2\xa0days') + self.t + 2 * self.oneweek + 2 * self.oneday), '2\xa0weeks, 2\xa0days') def test_display_first_unit(self): """ @@ -57,42 +57,42 @@ class TimesinceTests(unittest.TestCase): displayed. """ self.assertEqual(timesince(self.t, - self.t+2*self.oneweek+3*self.onehour+4*self.oneminute), + self.t + 2 * self.oneweek + 3 * self.onehour + 4 * self.oneminute), '2\xa0weeks') self.assertEqual(timesince(self.t, - self.t+4*self.oneday+5*self.oneminute), '4\xa0days') + self.t + 4 * self.oneday + 5 * self.oneminute), '4\xa0days') def test_display_second_before_first(self): """ When the second date occurs before the first, we should always get 0 minutes. """ - self.assertEqual(timesince(self.t, self.t-self.onemicrosecond), + self.assertEqual(timesince(self.t, self.t - self.onemicrosecond), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.onesecond), + self.assertEqual(timesince(self.t, self.t - self.onesecond), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.oneminute), + self.assertEqual(timesince(self.t, self.t - self.oneminute), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.onehour), + self.assertEqual(timesince(self.t, self.t - self.onehour), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.oneday), + self.assertEqual(timesince(self.t, self.t - self.oneday), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.oneweek), + self.assertEqual(timesince(self.t, self.t - self.oneweek), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.onemonth), + self.assertEqual(timesince(self.t, self.t - self.onemonth), '0\xa0minutes') - self.assertEqual(timesince(self.t, self.t-self.oneyear), + self.assertEqual(timesince(self.t, self.t - self.oneyear), '0\xa0minutes') self.assertEqual(timesince(self.t, - self.t-2*self.oneday-6*self.onehour), '0\xa0minutes') + self.t - 2 * self.oneday - 6 * self.onehour), '0\xa0minutes') self.assertEqual(timesince(self.t, - self.t-2*self.oneweek-2*self.oneday), '0\xa0minutes') + self.t - 2 * self.oneweek - 2 * self.oneday), '0\xa0minutes') self.assertEqual(timesince(self.t, - self.t-2*self.oneweek-3*self.onehour-4*self.oneminute), + self.t - 2 * self.oneweek - 3 * self.onehour - 4 * self.oneminute), '0\xa0minutes') self.assertEqual(timesince(self.t, - self.t-4*self.oneday-5*self.oneminute), '0\xa0minutes') + self.t - 4 * self.oneday - 5 * self.oneminute), '0\xa0minutes') @requires_tz_support def test_different_timezones(self): -- cgit v1.3