diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/admin_util/tests.py | 5 | ||||
| -rw-r--r-- | tests/i18n/tests.py | 8 | ||||
| -rw-r--r-- | tests/m2m_through_regress/tests.py | 2 | ||||
| -rw-r--r-- | tests/model_formsets/tests.py | 2 | ||||
| -rw-r--r-- | tests/multiple_database/tests.py | 2 | ||||
| -rw-r--r-- | tests/prefetch_related/models.py | 4 | ||||
| -rw-r--r-- | tests/queries/tests.py | 8 | ||||
| -rw-r--r-- | tests/validation/models.py | 2 |
8 files changed, 16 insertions, 17 deletions
diff --git a/tests/admin_util/tests.py b/tests/admin_util/tests.py index 31bb412af4..915dfced08 100644 --- a/tests/admin_util/tests.py +++ b/tests/admin_util/tests.py @@ -22,7 +22,6 @@ from .models import Article, Count, Event, Location, EventGuide class NestedObjectsTests(TestCase): """ Tests for ``NestedObject`` utility collection. - """ def setUp(self): self.n = NestedObjects(using=DEFAULT_DB_ALIAS) @@ -295,7 +294,7 @@ class UtilTests(SimpleTestCase): # safestring should not be escaped class MyForm(forms.Form): text = forms.CharField(label=mark_safe('<i>text</i>')) - cb = forms.BooleanField(label=mark_safe('<i>cb</i>')) + cb = forms.BooleanField(label=mark_safe('<i>cb</i>')) form = MyForm() self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), @@ -306,7 +305,7 @@ class UtilTests(SimpleTestCase): # normal strings needs to be escaped class MyForm(forms.Form): text = forms.CharField(label='&text') - cb = forms.BooleanField(label='&cb') + cb = forms.BooleanField(label='&cb') form = MyForm() self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index fbb3476f91..1e16caeaad 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1190,16 +1190,16 @@ class LocaleMiddlewareTests(TransRealMixin, TestCase): # Clear the session data before request session.save() - response = self.client.get('/en/simple/') + self.client.get('/en/simple/') self.assertEqual(self.client.session['_language'], 'en') # Clear the session data before request session.save() - response = self.client.get('/fr/simple/') + self.client.get('/fr/simple/') self.assertEqual(self.client.session['_language'], 'fr') # Check that language is not changed in session - response = self.client.get('/en/simple/') + self.client.get('/en/simple/') self.assertEqual(self.client.session['_language'], 'fr') @override_settings( @@ -1221,7 +1221,7 @@ class LocaleMiddlewareTests(TransRealMixin, TestCase): self.client.cookies[settings.SESSION_COOKIE_NAME] = session.session_key # request other language; should default to old language key value - response = self.client.get('/fr/simple/') + self.client.get('/fr/simple/') self.assertEqual(self.client.session['_language'], 'en') diff --git a/tests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py index c1b229b30b..3f5702efa8 100644 --- a/tests/m2m_through_regress/tests.py +++ b/tests/m2m_through_regress/tests.py @@ -98,7 +98,7 @@ class M2MThroughTestCase(TestCase): def test_join_trimming(self): "Check that we don't involve too many copies of the intermediate table when doing a join. Refs #8046, #8254" - bob = Person.objects.create(name="Bob") + bob = Person.objects.create(name="Bob") jim = Person.objects.create(name="Jim") rock = Group.objects.create(name="Rock") diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index b73e2afe5c..061d8c53e1 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -466,7 +466,7 @@ class ModelFormsetTest(TestCase): formset = AuthorBooksFormSet(instance=author) self.assertEqual(len(formset.forms), 3) self.assertHTMLEqual(formset.forms[0].as_p(), - '<p><label for="id_book_set-0-title">Title:</label> <input id="id_book_set-0-title" type="text" name="book_set-0-title" maxlength="100" /><input type="hidden" name="book_set-0-author" value="%d" id="id_book_set-0-author" /><input type="hidden" name="book_set-0-id" id="id_book_set-0-id" /></p>' % author.id) + '<p><label for="id_book_set-0-title">Title:</label> <input id="id_book_set-0-title" type="text" name="book_set-0-title" maxlength="100" /><input type="hidden" name="book_set-0-author" value="%d" id="id_book_set-0-author" /><input type="hidden" name="book_set-0-id" id="id_book_set-0-id" /></p>' % author.id) self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_book_set-1-title">Title:</label> <input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100" /><input type="hidden" name="book_set-1-author" value="%d" id="id_book_set-1-author" /><input type="hidden" name="book_set-1-id" id="id_book_set-1-id" /></p>' % author.id) self.assertHTMLEqual(formset.forms[2].as_p(), diff --git a/tests/multiple_database/tests.py b/tests/multiple_database/tests.py index 09c43414a5..431d62e112 100644 --- a/tests/multiple_database/tests.py +++ b/tests/multiple_database/tests.py @@ -1864,7 +1864,7 @@ class SyncOnlyDefaultDatabaseRouter(object): class MigrateTestCase(TestCase): - available_apps = [ + available_apps = [ 'multiple_database', 'django.contrib.auth', 'django.contrib.contenttypes' diff --git a/tests/prefetch_related/models.py b/tests/prefetch_related/models.py index bd3df00c6f..307cee1900 100644 --- a/tests/prefetch_related/models.py +++ b/tests/prefetch_related/models.py @@ -147,8 +147,8 @@ class Comment(models.Model): comment = models.TextField() # Content-object field - content_type = models.ForeignKey(ContentType) - object_pk = models.TextField() + content_type = models.ForeignKey(ContentType) + object_pk = models.TextField() content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk") diff --git a/tests/queries/tests.py b/tests/queries/tests.py index abc3c76c8f..b1c6336088 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1437,7 +1437,7 @@ class Queries4Tests(BaseQuerysetTest): self.assertQuerysetEqual(qs, [ci2.pk, ci3.pk], lambda x: x.pk, False) def test_ticket15316_one2one_filter_false(self): - c = SimpleCategory.objects.create(name="cat") + c = SimpleCategory.objects.create(name="cat") c0 = SimpleCategory.objects.create(name="cat0") c1 = SimpleCategory.objects.create(name="category1") @@ -1453,7 +1453,7 @@ class Queries4Tests(BaseQuerysetTest): self.assertQuerysetEqual(qs, [ci2.pk, ci3.pk], lambda x: x.pk, False) def test_ticket15316_one2one_exclude_false(self): - c = SimpleCategory.objects.create(name="cat") + c = SimpleCategory.objects.create(name="cat") c0 = SimpleCategory.objects.create(name="cat0") c1 = SimpleCategory.objects.create(name="category1") @@ -1469,7 +1469,7 @@ class Queries4Tests(BaseQuerysetTest): self.assertQuerysetEqual(qs, [ci1.pk], lambda x: x.pk) def test_ticket15316_one2one_filter_true(self): - c = SimpleCategory.objects.create(name="cat") + c = SimpleCategory.objects.create(name="cat") c0 = SimpleCategory.objects.create(name="cat0") c1 = SimpleCategory.objects.create(name="category1") @@ -1485,7 +1485,7 @@ class Queries4Tests(BaseQuerysetTest): self.assertQuerysetEqual(qs, [ci1.pk], lambda x: x.pk) def test_ticket15316_one2one_exclude_true(self): - c = SimpleCategory.objects.create(name="cat") + c = SimpleCategory.objects.create(name="cat") c0 = SimpleCategory.objects.create(name="cat0") c1 = SimpleCategory.objects.create(name="category1") diff --git a/tests/validation/models.py b/tests/validation/models.py index 958740dd2d..ee5bcfc9aa 100644 --- a/tests/validation/models.py +++ b/tests/validation/models.py @@ -50,7 +50,7 @@ class UniqueForDateModel(models.Model): name = models.CharField(max_length=100) class CustomMessagesModel(models.Model): - other = models.IntegerField(blank=True, null=True) + other = models.IntegerField(blank=True, null=True) number = models.IntegerField(db_column='number_val', error_messages={'null': 'NULL', 'not42': 'AAARGH', 'not_equal': '%s != me'}, validators=[validate_answer_to_universe] |
