diff options
author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-12-09 00:20:06 +0700 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2013-12-10 15:12:48 -0500 |
commit | a2814846ca006b4fbf3a893ec52cd9d444b3a3eb (patch) | |
tree | 780498814e830e2b8ee6ac435575afdc2e8e63f6 /tests | |
parent | 0873200e7f61315ad375061a3dc6d37b514ff985 (diff) | |
download | django-a2814846ca006b4fbf3a893ec52cd9d444b3a3eb.tar.gz |
Fixed E124 pep8 warnings.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/createsuperuser/tests.py | 3 | ||||
-rw-r--r-- | tests/custom_columns/tests.py | 3 | ||||
-rw-r--r-- | tests/custom_pk/tests.py | 3 | ||||
-rw-r--r-- | tests/extra_regress/tests.py | 29 | ||||
-rw-r--r-- | tests/get_object_or_404/tests.py | 21 | ||||
-rw-r--r-- | tests/get_or_create/tests.py | 9 | ||||
-rw-r--r-- | tests/inline_formsets/tests.py | 9 | ||||
-rw-r--r-- | tests/m2m_regress/tests.py | 3 | ||||
-rw-r--r-- | tests/many_to_one/tests.py | 5 | ||||
-rw-r--r-- | tests/middleware_exceptions/tests.py | 4 | ||||
-rw-r--r-- | tests/model_validation/tests.py | 14 | ||||
-rw-r--r-- | tests/modeladmin/tests.py | 174 | ||||
-rw-r--r-- | tests/proxy_models/tests.py | 18 | ||||
-rw-r--r-- | tests/raw_query/tests.py | 4 | ||||
-rw-r--r-- | tests/select_related/tests.py | 13 | ||||
-rw-r--r-- | tests/staticfiles_tests/tests.py | 6 | ||||
-rw-r--r-- | tests/template_tests/test_parser.py | 8 | ||||
-rw-r--r-- | tests/test_utils/tests.py | 4 |
18 files changed, 207 insertions, 123 deletions
diff --git a/tests/createsuperuser/tests.py b/tests/createsuperuser/tests.py index f64e4d9915..822f05d01b 100644 --- a/tests/createsuperuser/tests.py +++ b/tests/createsuperuser/tests.py @@ -38,7 +38,8 @@ class MultiDBCreatesuperuserTestCase(TestCase): " createsuperuser command should operate on specified DB" new_io = StringIO() - call_command("createsuperuser", + call_command( + "createsuperuser", interactive=False, username="joe", email="joe@somewhere.org", diff --git a/tests/custom_columns/tests.py b/tests/custom_columns/tests.py index 155279297f..aae3712e53 100644 --- a/tests/custom_columns/tests.py +++ b/tests/custom_columns/tests.py @@ -42,7 +42,8 @@ class CustomColumnsTests(TestCase): ) def test_field_error(self): - self.assertRaises(FieldError, + self.assertRaises( + FieldError, lambda: Author.objects.filter(firstname__exact="John") ) diff --git a/tests/custom_pk/tests.py b/tests/custom_pk/tests.py index 449e724acc..09a3ee5888 100644 --- a/tests/custom_pk/tests.py +++ b/tests/custom_pk/tests.py @@ -34,7 +34,8 @@ class CustomPKTests(TestCase): self.assertEqual(Employee.objects.get(pk=123), dan) self.assertEqual(Employee.objects.get(pk=456), fran) - self.assertRaises(Employee.DoesNotExist, + self.assertRaises( + Employee.DoesNotExist, lambda: Employee.objects.get(pk=42) ) diff --git a/tests/extra_regress/tests.py b/tests/extra_regress/tests.py index e9954add9b..4eaecc19af 100644 --- a/tests/extra_regress/tests.py +++ b/tests/extra_regress/tests.py @@ -91,14 +91,18 @@ class ExtraRegressTests(TestCase): internal dictionary must remain sorted. """ self.assertEqual( - User.objects.extra(select={"alpha": "%s"}, select_params=(1,) - ).extra(select={"beta": "%s"}, select_params=(2,))[0].alpha, - 1) + (User.objects + .extra(select={"alpha": "%s"}, select_params=(1,)) + .extra(select={"beta": "%s"}, select_params=(2,))[0].alpha), + 1 + ) self.assertEqual( - User.objects.extra(select={"beta": "%s"}, select_params=(1,) - ).extra(select={"alpha": "%s"}, select_params=(2,))[0].alpha, - 2) + (User.objects + .extra(select={"beta": "%s"}, select_params=(1,)) + .extra(select={"alpha": "%s"}, select_params=(2,))[0].alpha), + 2 + ) def test_regression_7961(self): """ @@ -107,8 +111,10 @@ class ExtraRegressTests(TestCase): query as well. """ self.assertEqual( - list(User.objects.extra(select={"alpha": "%s"}, select_params=(-6,) - ).filter(id=self.u.id).values_list('id', flat=True)), + list(User.objects + .extra(select={"alpha": "%s"}, select_params=(-6,)) + .filter(id=self.u.id) + .values_list('id', flat=True)), [self.u.id] ) @@ -129,10 +135,9 @@ class ExtraRegressTests(TestCase): should still be present because of the extra() call. """ self.assertQuerysetEqual( - Order.objects.extra(where=["username=%s"], - params=["fred"], - tables=["auth_user"] - ).order_by('created_by'), + (Order.objects + .extra(where=["username=%s"], params=["fred"], tables=["auth_user"]) + .order_by('created_by')), [] ) diff --git a/tests/get_object_or_404/tests.py b/tests/get_object_or_404/tests.py index 1a0b41bc4d..75d2a1c784 100644 --- a/tests/get_object_or_404/tests.py +++ b/tests/get_object_or_404/tests.py @@ -30,7 +30,8 @@ class GetObjectOr404Tests(TestCase): ) # No articles containing "Camelot". This should raise a Http404 error. - self.assertRaises(Http404, + self.assertRaises( + Http404, get_object_or_404, a1.article_set, title__contains="Camelot" ) @@ -49,12 +50,14 @@ class GetObjectOr404Tests(TestCase): # Just as when using a get() lookup, you will get an error if more than # one object is returned. - self.assertRaises(Author.MultipleObjectsReturned, + self.assertRaises( + Author.MultipleObjectsReturned, get_object_or_404, Author.objects.all() ) # Using an empty QuerySet raises a Http404 error. - self.assertRaises(Http404, + self.assertRaises( + Http404, get_object_or_404, Article.objects.none(), title__contains="Run" ) @@ -65,7 +68,8 @@ class GetObjectOr404Tests(TestCase): ) # Http404 is returned if the list is empty. - self.assertRaises(Http404, + self.assertRaises( + Http404, get_list_or_404, a1.article_set, title__icontains="Shrubbery" ) @@ -84,7 +88,8 @@ class GetObjectOr404Tests(TestCase): def test_bad_class(self): # Given an argument klass that is not a Model, Manager, or Queryset # raises a helpful ValueError message - self.assertRaisesMessage(ValueError, + self.assertRaisesMessage( + ValueError, "Object is of type 'str', but must be a Django Model, Manager, " "or QuerySet", get_object_or_404, str("Article"), title__icontains="Run" @@ -93,14 +98,16 @@ class GetObjectOr404Tests(TestCase): class CustomClass(object): pass - self.assertRaisesMessage(ValueError, + self.assertRaisesMessage( + ValueError, "Object is of type 'CustomClass', but must be a Django Model, " "Manager, or QuerySet", get_object_or_404, CustomClass, title__icontains="Run" ) # Works for lists too - self.assertRaisesMessage(ValueError, + self.assertRaisesMessage( + ValueError, "Object is of type 'list', but must be a Django Model, Manager, " "or QuerySet", get_list_or_404, [Article], title__icontains="Run" diff --git a/tests/get_or_create/tests.py b/tests/get_or_create/tests.py index d4aca54c91..1ddb2447fe 100644 --- a/tests/get_or_create/tests.py +++ b/tests/get_or_create/tests.py @@ -45,14 +45,16 @@ class GetOrCreateTests(TestCase): # If you don't specify a value or default value for all required # fields, you will get an error. - self.assertRaises(IntegrityError, + self.assertRaises( + IntegrityError, Person.objects.get_or_create, first_name="Tom", last_name="Smith" ) # If you specify an existing primary key, but different other fields, # then you will get an error and data will not be updated. ManualPrimaryKeyTest.objects.create(id=1, data="Original") - self.assertRaises(IntegrityError, + self.assertRaises( + IntegrityError, ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different" ) self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original") @@ -181,7 +183,8 @@ class UpdateOrCreateTests(TestCase): # If you specify an existing primary key, but different other fields, # then you will get an error and data will not be updated. ManualPrimaryKeyTest.objects.create(id=1, data="Original") - self.assertRaises(IntegrityError, + self.assertRaises( + IntegrityError, ManualPrimaryKeyTest.objects.update_or_create, id=1, data="Different" ) self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original") diff --git a/tests/inline_formsets/tests.py b/tests/inline_formsets/tests.py index 707115878f..e3c37bb320 100644 --- a/tests/inline_formsets/tests.py +++ b/tests/inline_formsets/tests.py @@ -123,7 +123,8 @@ class InlineFormsetFactoryTest(TestCase): Child has two ForeignKeys to Parent, so if we don't specify which one to use for the inline formset, we should get an exception. """ - six.assertRaisesRegex(self, Exception, + six.assertRaisesRegex( + self, Exception, "<class 'inline_formsets.models.Child'> has more than 1 ForeignKey to <class 'inline_formsets.models.Parent'>", inlineformset_factory, Parent, Child ) @@ -133,7 +134,8 @@ class InlineFormsetFactoryTest(TestCase): If we specify fk_name, but it isn't a ForeignKey from the child model to the parent model, we should get an exception. """ - self.assertRaises(Exception, + self.assertRaises( + Exception, "fk_name 'school' is not a ForeignKey to <class 'inline_formsets.models.Parent'>", inlineformset_factory, Parent, Child, fk_name='school' ) @@ -143,7 +145,8 @@ class InlineFormsetFactoryTest(TestCase): If the field specified in fk_name is not a ForeignKey, we should get an exception. """ - six.assertRaisesRegex(self, Exception, + six.assertRaisesRegex( + self, Exception, "<class 'inline_formsets.models.Child'> has no field named 'test'", inlineformset_factory, Parent, Child, fk_name='test' ) diff --git a/tests/m2m_regress/tests.py b/tests/m2m_regress/tests.py index eaba53a5b4..d1f85ace3e 100644 --- a/tests/m2m_regress/tests.py +++ b/tests/m2m_regress/tests.py @@ -36,7 +36,8 @@ class M2MRegressionTests(TestCase): # The secret internal related names for self-referential many-to-many # fields shouldn't appear in the list when an error is made. - six.assertRaisesRegex(self, FieldError, + six.assertRaisesRegex( + self, FieldError, "Choices are: id, name, references, related, selfreferchild, selfreferchildsibling$", lambda: SelfRefer.objects.filter(porcupine='fred') ) diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py index 8f1f7fc926..cefe74b95e 100644 --- a/tests/many_to_one/tests.py +++ b/tests/many_to_one/tests.py @@ -178,8 +178,9 @@ class ManyToOneTests(TestCase): ]) # ... and should work fine with the unicode that comes out of forms.Form.cleaned_data self.assertQuerysetEqual( - Article.objects.filter(reporter__first_name__exact='John' - ).extra(where=["many_to_one_reporter.last_name='%s'" % 'Smith']), + (Article.objects + .filter(reporter__first_name__exact='John') + .extra(where=["many_to_one_reporter.last_name='%s'" % 'Smith'])), [ "<Article: John's second story>", "<Article: This is a test>", diff --git a/tests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py index 83c6118c9d..47852f35fa 100644 --- a/tests/middleware_exceptions/tests.py +++ b/tests/middleware_exceptions/tests.py @@ -788,6 +788,4 @@ class RootUrlconfTests(TestCase): # Removing ROOT_URLCONF is safe, as override_settings will restore # the previously defined settings. del settings.ROOT_URLCONF - self.assertRaises(AttributeError, - self.client.get, "/middleware_exceptions/view/" - ) + self.assertRaises(AttributeError, self.client.get, "/middleware_exceptions/view/") diff --git a/tests/model_validation/tests.py b/tests/model_validation/tests.py index c55a1307e1..225656e4cb 100644 --- a/tests/model_validation/tests.py +++ b/tests/model_validation/tests.py @@ -32,16 +32,18 @@ class ModelValidationTest(TestCase): post_init.connect(OnPostInit(), sender='missing-app.Model') e = ModelErrorCollection(six.StringIO()) validate_model_signals(e) - self.assertSetEqual(set(e.errors), { - ('model_validation.tests', + self.assertSetEqual( + set(e.errors), + {( + 'model_validation.tests', "The `on_post_init` function was connected to the `post_init` " "signal with a lazy reference to the 'missing-app.Model' " "sender, which has not been installed." - ), - ('model_validation.tests', + ), ( + 'model_validation.tests', "An instance of the `OnPostInit` class was connected to " "the `post_init` signal with a lazy reference to the " "'missing-app.Model' sender, which has not been installed." - ) - }) + )} + ) post_init.unresolved_references = unresolved_references diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index 99cbc29951..38bfcc25dd 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -545,7 +545,8 @@ class ValidationTests(unittest.TestCase): site = AdminSite() - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.raw_id_fields' must be a list or tuple.", site.register, @@ -562,7 +563,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): raw_id_fields = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.raw_id_fields' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -572,7 +574,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): raw_id_fields = ('non_existent_field',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.raw_id_fields' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -582,7 +585,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): raw_id_fields = ('name',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.raw_id_fields\[0\]', 'name' must be either a ForeignKey or ManyToManyField.", ValidationTestModelAdmin.validate, @@ -599,7 +603,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.fieldsets' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -609,7 +614,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = ({},) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.fieldsets\[0\]' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -619,7 +625,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = ((),) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.fieldsets\[0\]' does not have exactly two elements.", ValidationTestModelAdmin.validate, @@ -629,7 +636,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = (("General", ()),) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.fieldsets\[0\]\[1\]' must be a dictionary.", ValidationTestModelAdmin.validate, @@ -639,7 +647,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = (("General", {}),) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'fields' key is required in ValidationTestModelAdmin.fieldsets\[0\]\[1\] field options dict.", ValidationTestModelAdmin.validate, @@ -655,7 +664,8 @@ class ValidationTests(unittest.TestCase): fieldsets = (("General", {"fields": ("name",)}),) fields = ["name"] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "Both fieldsets and fields are specified in ValidationTestModelAdmin.", ValidationTestModelAdmin.validate, @@ -665,7 +675,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fieldsets = [(None, {'fields': ['name', 'name']})] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "There are duplicate field\(s\) in ValidationTestModelAdmin.fieldsets", ValidationTestModelAdmin.validate, @@ -675,7 +686,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): fields = ["name", "name"] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "There are duplicate field\(s\) in ValidationTestModelAdmin.fields", ValidationTestModelAdmin.validate, @@ -690,7 +702,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): form = FakeForm - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "ValidationTestModelAdmin.form does not inherit from BaseModelForm.", ValidationTestModelAdmin.validate, @@ -727,7 +740,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_vertical = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_vertical' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -737,7 +751,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_vertical = ("non_existent_field",) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_vertical' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -747,7 +762,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_vertical = ("name",) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_vertical\[0\]' must be a ManyToManyField.", ValidationTestModelAdmin.validate, @@ -764,7 +780,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_horizontal = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_horizontal' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -774,7 +791,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_horizontal = ("non_existent_field",) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_horizontal' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -784,7 +802,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): filter_horizontal = ("name",) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.filter_horizontal\[0\]' must be a ManyToManyField.", ValidationTestModelAdmin.validate, @@ -801,7 +820,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): radio_fields = () - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.radio_fields' must be a dictionary.", ValidationTestModelAdmin.validate, @@ -811,7 +831,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): radio_fields = {"non_existent_field": None} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.radio_fields' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -821,7 +842,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): radio_fields = {"name": None} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.radio_fields\['name'\]' is neither an instance of ForeignKey nor does have choices set.", ValidationTestModelAdmin.validate, @@ -831,7 +853,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): radio_fields = {"state": None} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.radio_fields\['state'\]' is neither admin.HORIZONTAL nor admin.VERTICAL.", ValidationTestModelAdmin.validate, @@ -848,7 +871,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): prepopulated_fields = () - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.prepopulated_fields' must be a dictionary.", ValidationTestModelAdmin.validate, @@ -858,7 +882,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): prepopulated_fields = {"non_existent_field": None} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.prepopulated_fields' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -868,7 +893,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): prepopulated_fields = {"slug": ("non_existent_field",)} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.prepopulated_fields\['slug'\]\[0\]' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -878,7 +904,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): prepopulated_fields = {"users": ("name",)} - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.prepopulated_fields\['users'\]' is either a DateTimeField, ForeignKey or ManyToManyField. This isn't allowed.", ValidationTestModelAdmin.validate, @@ -895,7 +922,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_display' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -905,7 +933,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display = ('non_existent_field',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, str_prefix("ValidationTestModelAdmin.list_display\[0\], %(_)s'non_existent_field' is not a callable or an attribute of 'ValidationTestModelAdmin' or found in the model 'ValidationTestModel'."), ValidationTestModelAdmin.validate, @@ -915,7 +944,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display = ('users',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_display\[0\]', 'users' is a ManyToManyField which is not supported.", ValidationTestModelAdmin.validate, @@ -937,7 +967,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display_links = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_display_links' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -947,7 +978,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display_links = ('non_existent_field',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_display_links\[0\]' refers to 'non_existent_field' which is not defined in 'list_display'.", ValidationTestModelAdmin.validate, @@ -957,7 +989,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_display_links = ('name',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_display_links\[0\]' refers to 'name' which is not defined in 'list_display'.", ValidationTestModelAdmin.validate, @@ -985,7 +1018,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -995,7 +1029,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = ('non_existent_field',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter\[0\]' refers to 'non_existent_field' which does not refer to a Field.", ValidationTestModelAdmin.validate, @@ -1008,7 +1043,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = (RandomClass,) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter\[0\]' is 'RandomClass' which is not a descendant of ListFilter.", ValidationTestModelAdmin.validate, @@ -1018,7 +1054,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = (('is_active', RandomClass),) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter\[0\]\[1\]' is 'RandomClass' which is not of type FieldListFilter.", ValidationTestModelAdmin.validate, @@ -1038,7 +1075,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = (('is_active', AwesomeFilter),) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter\[0\]\[1\]' is 'AwesomeFilter' which is not of type FieldListFilter.", ValidationTestModelAdmin.validate, @@ -1048,7 +1086,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_filter = (BooleanFieldListFilter,) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_filter\[0\]' is 'BooleanFieldListFilter' which is of type FieldListFilter but is not associated with a field name.", ValidationTestModelAdmin.validate, @@ -1067,7 +1106,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_per_page = 'hello' - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_per_page' should be a int.", ValidationTestModelAdmin.validate, @@ -1084,7 +1124,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): list_max_show_all = 'hello' - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.list_max_show_all' should be a int.", ValidationTestModelAdmin.validate, @@ -1101,7 +1142,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): search_fields = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.search_fields' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -1113,7 +1155,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): date_hierarchy = 'non_existent_field' - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.date_hierarchy' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -1123,7 +1166,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): date_hierarchy = 'name' - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.date_hierarchy is neither an instance of DateField nor DateTimeField.", ValidationTestModelAdmin.validate, @@ -1140,7 +1184,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): ordering = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.ordering' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -1150,7 +1195,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): ordering = ('non_existent_field',) - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.ordering\[0\]' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestModel'.", ValidationTestModelAdmin.validate, @@ -1160,7 +1206,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): ordering = ('?', 'name') - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.ordering' has the random ordering marker '\?', but contains other fields as well. Please either remove '\?' or the other fields.", ValidationTestModelAdmin.validate, @@ -1206,7 +1253,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): save_as = 1 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.save_as' should be a bool.", ValidationTestModelAdmin.validate, @@ -1223,7 +1271,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): save_on_top = 1 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.save_on_top' should be a bool.", ValidationTestModelAdmin.validate, @@ -1240,7 +1289,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = 10 - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.inlines' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -1253,7 +1303,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.inlines\[0\]' does not inherit from BaseModelAdmin.", ValidationTestModelAdmin.validate, @@ -1266,7 +1317,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'model' is a required attribute of 'ValidationTestModelAdmin.inlines\[0\]'.", ValidationTestModelAdmin.validate, @@ -1282,7 +1334,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestModelAdmin.inlines\[0\].model' does not inherit from models.Model.", ValidationTestModelAdmin.validate, @@ -1306,7 +1359,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestInline.fields' must be a list or tuple.", ValidationTestModelAdmin.validate, @@ -1322,7 +1376,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestInline.fk_name' refers to field 'non_existent_field' that is missing from model 'modeladmin.ValidationTestInlineModel'.", ValidationTestModelAdmin.validate, @@ -1347,7 +1402,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestInline.extra' should be a int.", ValidationTestModelAdmin.validate, @@ -1372,7 +1428,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestInline.max_num' should be a int.", ValidationTestModelAdmin.validate, @@ -1400,7 +1457,8 @@ class ValidationTests(unittest.TestCase): class ValidationTestModelAdmin(ModelAdmin): inlines = [ValidationTestInline] - six.assertRaisesRegex(self, + six.assertRaisesRegex( + self, ImproperlyConfigured, "'ValidationTestInline.formset' does not inherit from BaseModelFormSet.", ValidationTestModelAdmin.validate, diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py index 3582625f45..8be7929ac4 100644 --- a/tests/proxy_models/tests.py +++ b/tests/proxy_models/tests.py @@ -91,15 +91,18 @@ class ProxyModelTests(TestCase): LowerStatusPerson.objects.create(status="low", name="homer") max_id = Person.objects.aggregate(max_id=models.Max('id'))['max_id'] - self.assertRaises(Person.DoesNotExist, + self.assertRaises( + Person.DoesNotExist, MyPersonProxy.objects.get, name='Zathras' ) - self.assertRaises(Person.MultipleObjectsReturned, + self.assertRaises( + Person.MultipleObjectsReturned, MyPersonProxy.objects.get, id__lt=max_id + 1 ) - self.assertRaises(Person.DoesNotExist, + self.assertRaises( + Person.DoesNotExist, StatusPerson.objects.get, name='Zathras' ) @@ -108,7 +111,8 @@ class ProxyModelTests(TestCase): StatusPerson.objects.create(name='Foo Jr.') max_id = Person.objects.aggregate(max_id=models.Max('id'))['max_id'] - self.assertRaises(Person.MultipleObjectsReturned, + self.assertRaises( + Person.MultipleObjectsReturned, StatusPerson.objects.get, id__lt=max_id + 1 ) @@ -344,7 +348,8 @@ class ProxyModelTests(TestCase): resp = ProxyImprovement.objects.select_related().get( reporter__name__icontains='butor' ) - self.assertEqual(repr(resp), + self.assertEqual( + repr(resp), '<ProxyImprovement: ProxyImprovement:improve that>' ) @@ -352,7 +357,8 @@ class ProxyModelTests(TestCase): resp = ProxyImprovement.objects.select_related().get( associated_bug__summary__icontains='fix' ) - self.assertEqual(repr(resp), + self.assertEqual( + repr(resp), '<ProxyImprovement: ProxyImprovement:improve that>' ) diff --git a/tests/raw_query/tests.py b/tests/raw_query/tests.py index b57ce52f0b..4c30984e9c 100644 --- a/tests/raw_query/tests.py +++ b/tests/raw_query/tests.py @@ -234,6 +234,4 @@ class RawQueryTests(TestCase): ) def test_query_count(self): - self.assertNumQueries(1, - list, Author.objects.raw("SELECT * FROM raw_query_author") - ) + self.assertNumQueries(1, list, Author.objects.raw("SELECT * FROM raw_query_author")) diff --git a/tests/select_related/tests.py b/tests/select_related/tests.py index 59b19d97f6..52aff92a7c 100644 --- a/tests/select_related/tests.py +++ b/tests/select_related/tests.py @@ -100,8 +100,9 @@ class SelectRelatedTests(TestCase): ['Agaricales', 'Diptera', 'Fabales', 'Primates']) def test_select_related_with_extra(self): - s = Species.objects.all().select_related()\ - .extra(select={'a': 'select_related_species.id + 10'})[0] + s = (Species.objects.all() + .select_related() + .extra(select={'a': 'select_related_species.id + 10'})[0]) self.assertEqual(s.id + 10, s.a) def test_certain_fields(self): @@ -131,12 +132,14 @@ class SelectRelatedTests(TestCase): def test_field_traversal(self): with self.assertNumQueries(1): - s = Species.objects.all().select_related('genus__family__order' - ).order_by('id')[0:1].get().genus.family.order.name + s = (Species.objects.all() + .select_related('genus__family__order') + .order_by('id')[0:1].get().genus.family.order.name) self.assertEqual(s, 'Diptera') def test_depth_fields_fails(self): - self.assertRaises(TypeError, + self.assertRaises( + TypeError, Species.objects.select_related, 'genus__family__order', depth=4 ) diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py index e7c1383373..a218194e4c 100644 --- a/tests/staticfiles_tests/tests.py +++ b/tests/staticfiles_tests/tests.py @@ -362,7 +362,8 @@ class TestCollectionNonLocalStorage(CollectionTestCase, TestNoFilesCreated): # we set DEBUG to False here since the template tag wouldn't work otherwise -@override_settings(**dict(TEST_SETTINGS, +@override_settings(**dict( + TEST_SETTINGS, STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage', DEBUG=False, )) @@ -569,7 +570,8 @@ class TestCollectionCachedStorage(BaseCollectionTestCase, # we set DEBUG to False here since the template tag wouldn't work otherwise -@override_settings(**dict(TEST_SETTINGS, +@override_settings(**dict( + TEST_SETTINGS, STATICFILES_STORAGE='staticfiles_tests.storage.SimpleCachedStaticFilesStorage', DEBUG=False, )) diff --git a/tests/template_tests/test_parser.py b/tests/template_tests/test_parser.py index 2945bfabce..275d7ea4be 100644 --- a/tests/template_tests/test_parser.py +++ b/tests/template_tests/test_parser.py @@ -58,9 +58,7 @@ class ParserTests(TestCase): # Filtered variables should reject access of attributes beginning with # underscores. - self.assertRaises(TemplateSyntaxError, - FilterExpression, "article._hidden|upper", p - ) + self.assertRaises(TemplateSyntaxError, FilterExpression, "article._hidden|upper", p) def test_variable_parsing(self): c = {"article": {"section": "News"}} @@ -83,9 +81,7 @@ class ParserTests(TestCase): # Variables should reject access of attributes beginning with # underscores. - self.assertRaises(TemplateSyntaxError, - Variable, "article._hidden" - ) + self.assertRaises(TemplateSyntaxError, Variable, "article._hidden") # Variables should raise on non string type with six.assertRaisesRegex(self, TypeError, "Variable must be a string or number, got <(class|type) 'dict'>"): diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index 9f7831d2b7..7426155e2a 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -56,9 +56,7 @@ class AssertNumQueriesTests(TestCase): def test_func(): raise ValueError - self.assertRaises(ValueError, - self.assertNumQueries, 2, test_func - ) + self.assertRaises(ValueError, self.assertNumQueries, 2, test_func) def test_assert_num_queries_with_client(self): person = Person.objects.create(name='test') |