diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/admin_inlines/admin.py | 4 | ||||
-rw-r--r-- | tests/admin_validation/tests.py | 2 | ||||
-rw-r--r-- | tests/admin_views/admin.py | 6 | ||||
-rw-r--r-- | tests/admin_widgets/tests.py | 2 | ||||
-rw-r--r-- | tests/backends/tests.py | 4 | ||||
-rw-r--r-- | tests/cache/tests.py | 4 | ||||
-rw-r--r-- | tests/defer/models.py | 2 | ||||
-rw-r--r-- | tests/dispatch/tests/test_saferef.py | 2 | ||||
-rw-r--r-- | tests/distinct_on_fields/tests.py | 4 | ||||
-rw-r--r-- | tests/expressions_regress/tests.py | 12 | ||||
-rw-r--r-- | tests/forms_tests/tests/test_widgets.py | 17 | ||||
-rw-r--r-- | tests/i18n/commands/compilation.py | 12 | ||||
-rw-r--r-- | tests/i18n/commands/extraction.py | 8 | ||||
-rw-r--r-- | tests/m2m_and_m2o/tests.py | 4 | ||||
-rw-r--r-- | tests/m2m_through_regress/tests.py | 2 | ||||
-rw-r--r-- | tests/model_forms/tests.py | 2 | ||||
-rw-r--r-- | tests/model_inheritance_regress/tests.py | 2 | ||||
-rw-r--r-- | tests/multiple_database/tests.py | 6 | ||||
-rw-r--r-- | tests/queries/tests.py | 6 | ||||
-rw-r--r-- | tests/select_related_regress/tests.py | 24 | ||||
-rw-r--r-- | tests/validation/tests.py | 2 |
21 files changed, 69 insertions, 58 deletions
diff --git a/tests/admin_inlines/admin.py b/tests/admin_inlines/admin.py index 91578042cc..98c19befa4 100644 --- a/tests/admin_inlines/admin.py +++ b/tests/admin_inlines/admin.py @@ -107,7 +107,7 @@ class InlineWeakness(admin.TabularInline): class QuestionInline(admin.TabularInline): model = Question - readonly_fields=['call_me'] + readonly_fields = ['call_me'] def call_me(self, obj): return 'Callable in QuestionInline' @@ -122,7 +122,7 @@ class PollAdmin(admin.ModelAdmin): class ChapterInline(admin.TabularInline): model = Chapter - readonly_fields=['call_me'] + readonly_fields = ['call_me'] def call_me(self, obj): return 'Callable in ChapterInline' diff --git a/tests/admin_validation/tests.py b/tests/admin_validation/tests.py index 0deb80c0ef..4bb1f17fd8 100644 --- a/tests/admin_validation/tests.py +++ b/tests/admin_validation/tests.py @@ -193,7 +193,7 @@ class ValidationTestCase(TestCase): def test_nonexistant_field_on_inline(self): class CityInline(admin.TabularInline): model = City - readonly_fields=['i_dont_exist'] # Missing attribute + readonly_fields = ['i_dont_exist'] # Missing attribute self.assertRaisesMessage(ImproperlyConfigured, str_prefix("CityInline.readonly_fields[0], %(_)s'i_dont_exist' is not a callable " diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index 85f6298a18..889c51a6db 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -47,7 +47,7 @@ class ArticleInline(admin.TabularInline): prepopulated_fields = { 'title' : ('content',) } - fieldsets=( + fieldsets = ( ('Some fields', { 'classes': ('collapse',), 'fields': ('title', 'content') @@ -74,7 +74,7 @@ class ChapterXtra1Admin(admin.ModelAdmin): class ArticleAdmin(admin.ModelAdmin): list_display = ('content', 'date', callable_year, 'model_year', 'modeladmin_year') list_filter = ('date', 'section') - fieldsets=( + fieldsets = ( ('Some fields', { 'classes': ('collapse',), 'fields': ('title', 'content') @@ -465,7 +465,7 @@ class WorkHourAdmin(admin.ModelAdmin): class FoodDeliveryAdmin(admin.ModelAdmin): - list_display=('reference', 'driver', 'restaurant') + list_display = ('reference', 'driver', 'restaurant') list_editable = ('driver', 'restaurant') diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index ccc9add36e..ee8b2f3bac 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -166,7 +166,7 @@ class AdminFormfieldForDBFieldTests(TestCase): def test_m2m_widgets(self): """m2m fields help text as it applies to admin app (#9321).""" class AdvisorAdmin(admin.ModelAdmin): - filter_vertical=['companies'] + filter_vertical = ['companies'] self.assertFormfield(models.Advisor, 'companies', widgets.FilteredSelectMultiple, filter_vertical=['companies']) diff --git a/tests/backends/tests.py b/tests/backends/tests.py index c6fe4e98f3..3c0cc67ea2 100644 --- a/tests/backends/tests.py +++ b/tests/backends/tests.py @@ -496,9 +496,9 @@ class BackendTestCase(TestCase): tbl = connection.introspection.table_name_converter(opts.db_table) f1 = connection.ops.quote_name(opts.get_field('root').column) f2 = connection.ops.quote_name(opts.get_field('square').column) - if paramstyle=='format': + if paramstyle == 'format': query = 'INSERT INTO %s (%s, %s) VALUES (%%s, %%s)' % (tbl, f1, f2) - elif paramstyle=='pyformat': + elif paramstyle == 'pyformat': query = 'INSERT INTO %s (%s, %s) VALUES (%%(root)s, %%(square)s)' % (tbl, f1, f2) else: raise ValueError("unsupported paramstyle in test") diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 9681c201ed..5712f10b4f 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1527,8 +1527,8 @@ class CacheI18nTest(TestCase): self.assertEqual(get_cache_data, None) # i18n tests - en_message ="Hello world!" - es_message ="Hola mundo!" + en_message = "Hello world!" + es_message = "Hola mundo!" request = self._get_request_cache() set_cache(request, 'en', en_message) diff --git a/tests/defer/models.py b/tests/defer/models.py index 0688cbc984..cf3bae86bb 100644 --- a/tests/defer/models.py +++ b/tests/defer/models.py @@ -27,4 +27,4 @@ class BigChild(Primary): class ChildProxy(Child): class Meta: - proxy=True + proxy = True diff --git a/tests/dispatch/tests/test_saferef.py b/tests/dispatch/tests/test_saferef.py index a9a246304e..531e8f43de 100644 --- a/tests/dispatch/tests/test_saferef.py +++ b/tests/dispatch/tests/test_saferef.py @@ -69,4 +69,4 @@ class SaferefTests(unittest.TestCase): def _closure(self, ref): """Dumb utility mechanism to increment deletion counter""" - self.closureCount +=1 + self.closureCount += 1 diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py index cb88f60321..505a0470bf 100644 --- a/tests/distinct_on_fields/tests.py +++ b/tests/distinct_on_fields/tests.py @@ -57,8 +57,8 @@ class DistinctOnTests(TestCase): # Does combining querysets work? ( (Celebrity.objects.filter(fan__in=[self.fan1, self.fan2]). - distinct('name').order_by('name') - |Celebrity.objects.filter(fan__in=[self.fan3]). + distinct('name').order_by('name') | + Celebrity.objects.filter(fan__in=[self.fan3]). distinct('name').order_by('name')), ['<Celebrity: c1>', '<Celebrity: c2>'], ), diff --git a/tests/expressions_regress/tests.py b/tests/expressions_regress/tests.py index 470ab7c8e5..0e168e924a 100644 --- a/tests/expressions_regress/tests.py +++ b/tests/expressions_regress/tests.py @@ -224,7 +224,7 @@ class FTimeDeltaTests(TestCase): e0 = Experiment.objects.create(name='e0', assigned=sday, start=stime, end=end, completed=end.date()) self.deltas.append(delta0) - self.delays.append(e0.start- + self.delays.append(e0.start - datetime.datetime.combine(e0.assigned, midnight)) self.days_long.append(e0.completed-e0.assigned) @@ -239,7 +239,7 @@ class FTimeDeltaTests(TestCase): e1 = Experiment.objects.create(name='e1', assigned=sday, start=stime+delay, end=end, completed=end.date()) self.deltas.append(delta1) - self.delays.append(e1.start- + self.delays.append(e1.start - datetime.datetime.combine(e1.assigned, midnight)) self.days_long.append(e1.completed-e1.assigned) @@ -249,7 +249,7 @@ class FTimeDeltaTests(TestCase): assigned=sday-datetime.timedelta(3), start=stime, end=end, completed=end.date()) self.deltas.append(delta2) - self.delays.append(e2.start- + self.delays.append(e2.start - datetime.datetime.combine(e2.assigned, midnight)) self.days_long.append(e2.completed-e2.assigned) @@ -259,7 +259,7 @@ class FTimeDeltaTests(TestCase): e3 = Experiment.objects.create(name='e3', assigned=sday, start=stime+delay, end=end, completed=end.date()) self.deltas.append(delta3) - self.delays.append(e3.start- + self.delays.append(e3.start - datetime.datetime.combine(e3.assigned, midnight)) self.days_long.append(e3.completed-e3.assigned) @@ -269,7 +269,7 @@ class FTimeDeltaTests(TestCase): assigned=sday-datetime.timedelta(10), start=stime, end=end, completed=end.date()) self.deltas.append(delta4) - self.delays.append(e4.start- + self.delays.append(e4.start - datetime.datetime.combine(e4.assigned, midnight)) self.days_long.append(e4.completed-e4.assigned) self.expnames = [e.name for e in Experiment.objects.all()] @@ -341,7 +341,7 @@ class FTimeDeltaTests(TestCase): self.assertEqual(test_set, self.expnames[:i]) test_set = [e.name for e in - Experiment.objects.filter(start__lte=F('assigned')+delay+ + Experiment.objects.filter(start__lte=F('assigned') + delay + datetime.timedelta(1))] self.assertEqual(test_set, self.expnames[:i+1]) diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py index e6509e8699..48bd068b21 100644 --- a/tests/forms_tests/tests/test_widgets.py +++ b/tests/forms_tests/tests/test_widgets.py @@ -340,7 +340,10 @@ class FormsWidgetTestCase(TestCase): </select>""") # Choices can be nested one level in order to create HTML optgroups: - w.choices=(('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2')))) + w.choices = ( + ('outer1', 'Outer 1'), + ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))), + ) self.assertHTMLEqual(w.render('nestchoice', None), """<select name="nestchoice"> <option value="outer1">Outer 1</option> <optgroup label="Group "1""> @@ -706,7 +709,11 @@ beatle J R Ringo False""") def test_nested_choices(self): # Choices can be nested for radio buttons: w = RadioSelect() - w.choices=(('unknown', 'Unknown'), ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), ('Video', (('vhs', 'VHS'), ('dvd', 'DVD')))) + w.choices = ( + ('unknown', 'Unknown'), + ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), + ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))), + ) self.assertHTMLEqual(w.render('nestchoice', 'dvd', attrs={'id':'media'}), """<ul id="media"> <li><label for="media_0"><input id="media_0" name="nestchoice" type="radio" value="unknown" /> Unknown</label></li> <li>Audio<ul id="media_1"> @@ -721,7 +728,11 @@ beatle J R Ringo False""") # Choices can be nested for checkboxes: w = CheckboxSelectMultiple() - w.choices=(('unknown', 'Unknown'), ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), ('Video', (('vhs', 'VHS'), ('dvd', 'DVD')))) + w.choices = ( + ('unknown', 'Unknown'), + ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), + ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))), + ) self.assertHTMLEqual(w.render('nestchoice', ('vinyl', 'dvd'), attrs={'id':'media'}), """<ul id="media"> <li><label for="media_0"><input id="media_0" name="nestchoice" type="checkbox" value="unknown" /> Unknown</label></li> <li>Audio<ul id="media_1"> diff --git a/tests/i18n/commands/compilation.py b/tests/i18n/commands/compilation.py index 12bb89ed08..7a159ad1fc 100644 --- a/tests/i18n/commands/compilation.py +++ b/tests/i18n/commands/compilation.py @@ -37,8 +37,8 @@ class PoFileTests(MessageCompilationTests): class PoFileContentsTests(MessageCompilationTests): # Ticket #11240 - LOCALE='fr' - MO_FILE='locale/%s/LC_MESSAGES/django.mo' % LOCALE + LOCALE = 'fr' + MO_FILE = 'locale/%s/LC_MESSAGES/django.mo' % LOCALE def setUp(self): super(PoFileContentsTests, self).setUp() @@ -53,8 +53,8 @@ class PercentRenderingTests(MessageCompilationTests): # Ticket #11240 -- Testing rendering doesn't belong here but we are trying # to keep tests for all the stack together - LOCALE='it' - MO_FILE='locale/%s/LC_MESSAGES/django.mo' % LOCALE + LOCALE = 'it' + MO_FILE = 'locale/%s/LC_MESSAGES/django.mo' % LOCALE def setUp(self): super(PercentRenderingTests, self).setUp() @@ -101,8 +101,8 @@ class MultipleLocaleCompilationTests(MessageCompilationTests): class CompilationErrorHandling(MessageCompilationTests): - LOCALE='ja' - MO_FILE='locale/%s/LC_MESSAGES/django.mo' % LOCALE + LOCALE = 'ja' + MO_FILE = 'locale/%s/LC_MESSAGES/django.mo' % LOCALE def setUp(self): super(CompilationErrorHandling, self).setUp() diff --git a/tests/i18n/commands/extraction.py b/tests/i18n/commands/extraction.py index 107fd4ab1c..462af6064c 100644 --- a/tests/i18n/commands/extraction.py +++ b/tests/i18n/commands/extraction.py @@ -17,11 +17,11 @@ from django.utils.six import StringIO from django.utils.translation import TranslatorCommentWarning -LOCALE='de' +LOCALE = 'de' class ExtractorTests(SimpleTestCase): - PO_FILE='locale/%s/LC_MESSAGES/django.po' % LOCALE + PO_FILE = 'locale/%s/LC_MESSAGES/django.po' % LOCALE def setUp(self): self._cwd = os.getcwd() @@ -255,7 +255,7 @@ class BasicExtractorTests(ExtractorTests): class JavascriptExtractorTests(ExtractorTests): - PO_FILE='locale/%s/LC_MESSAGES/djangojs.po' % LOCALE + PO_FILE = 'locale/%s/LC_MESSAGES/djangojs.po' % LOCALE def test_javascript_literals(self): os.chdir(self.test_dir) @@ -426,7 +426,7 @@ class LocationCommentsTests(ExtractorTests): class KeepPotFileExtractorTests(ExtractorTests): - POT_FILE='locale/django.pot' + POT_FILE = 'locale/django.pot' def setUp(self): super(KeepPotFileExtractorTests, self).setUp() diff --git a/tests/m2m_and_m2o/tests.py b/tests/m2m_and_m2o/tests.py index 646212bf4f..ee5d77919f 100644 --- a/tests/m2m_and_m2o/tests.py +++ b/tests/m2m_and_m2o/tests.py @@ -80,8 +80,8 @@ class RelatedObjectUnicodeTests(TestCase): Regression test for #6045: references to other models can be unicode strings, providing they are directly convertible to ASCII. """ - m1=UnicodeReferenceModel.objects.create() - m2=UnicodeReferenceModel.objects.create() + m1 = UnicodeReferenceModel.objects.create() + m2 = UnicodeReferenceModel.objects.create() m2.others.add(m1) # used to cause an error (see ticket #6045) m2.save() list(m2.others.all()) # Force retrieval. diff --git a/tests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py index 3f5702efa8..e0796242aa 100644 --- a/tests/m2m_through_regress/tests.py +++ b/tests/m2m_through_regress/tests.py @@ -68,7 +68,7 @@ class M2MThroughTestCase(TestCase): p = Person.objects.create(name="Bob") g = Group.objects.create(name="Roll") - m =Membership.objects.create(person=p, group=g) + m = Membership.objects.create(person=p, group=g) pks = {"p_pk": p.pk, "g_pk": g.pk, "m_pk": m.pk} diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 4551084eae..5388ec99d0 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -791,7 +791,7 @@ class ModelToDictTests(TestCase): Tests for forms.models.model_to_dict """ def test_model_to_dict_many_to_many(self): - categories=[ + categories = [ Category(name='TestName1', slug='TestName1', url='url1'), Category(name='TestName2', slug='TestName2', url='url2'), Category(name='TestName3', slug='TestName3', url='url3') diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py index cd77085fbb..710cebaa8f 100644 --- a/tests/model_inheritance_regress/tests.py +++ b/tests/model_inheritance_regress/tests.py @@ -82,7 +82,7 @@ class ModelInheritanceTest(TestCase): italian_restaurant.serves_gnocchi = False italian_restaurant.save_base(raw=True) - place2.name='Derelict lot' + place2.name = 'Derelict lot' place2.save_base(raw=True) park.capacity = 50 diff --git a/tests/multiple_database/tests.py b/tests/multiple_database/tests.py index 431d62e112..b00ff8a620 100644 --- a/tests/multiple_database/tests.py +++ b/tests/multiple_database/tests.py @@ -39,7 +39,7 @@ class QueryTestCase(TestCase): # Create a book on the default database using a save dive = Book() - dive.title="Dive into Python" + dive.title = "Dive into Python" dive.published = datetime.date(2009, 5, 4) dive.save() @@ -74,7 +74,7 @@ class QueryTestCase(TestCase): # Create a book on the default database using a save dive = Book() - dive.title="Dive into Python" + dive.title = "Dive into Python" dive.published = datetime.date(2009, 5, 4) dive.save(using='other') @@ -1794,7 +1794,7 @@ class RouterAttributeErrorTestCase(TestCase): def test_attribute_error_save(self): "Check that the AttributeError from AttributeErrorRouter bubbles up" dive = Book() - dive.title="Dive into Python" + dive.title = "Dive into Python" dive.published = datetime.date(2009, 5, 4) self.assertRaises(AttributeError, dive.save) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index b1c6336088..dcdd6539e3 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -579,7 +579,7 @@ class Queries1Tests(BaseQuerysetTest): ['datetime.datetime(2007, 12, 19, 0, 0)', 'datetime.datetime(2007, 12, 20, 0, 0)'] ) - name="one" + name = "one" self.assertQuerysetEqual( Item.objects.datetimes('created', 'day').extra(where=['name=%s'], params=[name]), ['datetime.datetime(2007, 12, 19, 0, 0)'] @@ -2670,8 +2670,8 @@ class NullJoinPromotionOrTest(TestCase): # b__c__name generates join to c, which the ORM tried to promote but # failed as that join isn't nullable. q_obj = ( - Q(d__name='foo')| - Q(b__name='foo')| + Q(d__name='foo') | + Q(b__name='foo') | Q(b__c__name='foo') ) qset = ModelA.objects.filter(q_obj) diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py index 59f4c0d94e..6619105069 100644 --- a/tests/select_related_regress/tests.py +++ b/tests/select_related_regress/tests.py @@ -23,21 +23,21 @@ class SelectRelatedRegressTests(TestCase): and include some unnecessary bonus joins). """ - b=Building.objects.create(name='101') - dev1=Device.objects.create(name="router", building=b) - dev2=Device.objects.create(name="switch", building=b) - dev3=Device.objects.create(name="server", building=b) - port1=Port.objects.create(port_number='4',device=dev1) - port2=Port.objects.create(port_number='7',device=dev2) - port3=Port.objects.create(port_number='1',device=dev3) - c1=Connection.objects.create(start=port1, end=port2) - c2=Connection.objects.create(start=port2, end=port3) - - connections=Connection.objects.filter(start__device__building=b, end__device__building=b).order_by('id') + b = Building.objects.create(name='101') + dev1 = Device.objects.create(name="router", building=b) + dev2 = Device.objects.create(name="switch", building=b) + dev3 = Device.objects.create(name="server", building=b) + port1 = Port.objects.create(port_number='4',device=dev1) + port2 = Port.objects.create(port_number='7',device=dev2) + port3 = Port.objects.create(port_number='1',device=dev3) + c1 = Connection.objects.create(start=port1, end=port2) + c2 = Connection.objects.create(start=port2, end=port3) + + connections = Connection.objects.filter(start__device__building=b, end__device__building=b).order_by('id') self.assertEqual([(c.id, six.text_type(c.start), six.text_type(c.end)) for c in connections], [(c1.id, 'router/4', 'switch/7'), (c2.id, 'switch/7', 'server/1')]) - connections=Connection.objects.filter(start__device__building=b, end__device__building=b).select_related().order_by('id') + connections = Connection.objects.filter(start__device__building=b, end__device__building=b).select_related().order_by('id') self.assertEqual([(c.id, six.text_type(c.start), six.text_type(c.end)) for c in connections], [(c1.id, 'router/4', 'switch/7'), (c2.id, 'switch/7', 'server/1')]) diff --git a/tests/validation/tests.py b/tests/validation/tests.py index 34cde3fc8a..7f028e655b 100644 --- a/tests/validation/tests.py +++ b/tests/validation/tests.py @@ -24,7 +24,7 @@ class BaseModelValidationTests(ValidationTestCase): self.assertFailsValidation(mtv.full_clean, [NON_FIELD_ERRORS, 'name']) def test_wrong_FK_value_raises_error(self): - mtv=ModelToValidate(number=10, name='Some Name', parent_id=3) + mtv = ModelToValidate(number=10, name='Some Name', parent_id=3) self.assertFailsValidation(mtv.full_clean, ['parent']) def test_correct_FK_value_validates(self): |