diff options
author | Simon Charette <charette.s@gmail.com> | 2017-01-19 09:48:01 -0500 |
---|---|---|
committer | Simon Charette <charette.s@gmail.com> | 2017-01-19 11:31:07 -0500 |
commit | 9695b149820cff31cfa48973efe4256c80811e87 (patch) | |
tree | bf73b5301788ac35873b208b15c512fb585708b9 /tests/apps | |
parent | 41e0033caf1267edda2b780ae50a3881c3de94ef (diff) | |
download | django-9695b149820cff31cfa48973efe4256c80811e87.tar.gz |
Refs #23919 -- Removed str() conversion of type and method __name__.
Diffstat (limited to 'tests/apps')
-rw-r--r-- | tests/apps/tests.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/apps/tests.py b/tests/apps/tests.py index e270662436..0263af897f 100644 --- a/tests/apps/tests.py +++ b/tests/apps/tests.py @@ -197,10 +197,10 @@ class AppsTests(SimpleTestCase): 'app_label': "apps", 'apps': new_apps, } - meta = type(str("Meta"), tuple(), meta_contents) + meta = type("Meta", tuple(), meta_contents) body['Meta'] = meta body['__module__'] = TotallyNormal.__module__ - temp_model = type(str("SouthPonies"), (models.Model,), body) + temp_model = type("SouthPonies", (models.Model,), body) # Make sure it appeared in the right place! self.assertListEqual(list(apps.get_app_config("apps").get_models()), old_models) with self.assertRaises(LookupError): @@ -218,15 +218,15 @@ class AppsTests(SimpleTestCase): } body = {} - body['Meta'] = type(str("Meta"), tuple(), meta_contents) + body['Meta'] = type("Meta", tuple(), meta_contents) body['__module__'] = TotallyNormal.__module__ - type(str("SouthPonies"), (models.Model,), body) + type("SouthPonies", (models.Model,), body) # When __name__ and __module__ match we assume the module # was reloaded and issue a warning. This use-case is # useful for REPL. Refs #23621. body = {} - body['Meta'] = type(str("Meta"), tuple(), meta_contents) + body['Meta'] = type("Meta", tuple(), meta_contents) body['__module__'] = TotallyNormal.__module__ msg = ( "Model 'apps.southponies' was already registered. " @@ -234,15 +234,15 @@ class AppsTests(SimpleTestCase): "most notably with related models." ) with self.assertRaisesMessage(RuntimeWarning, msg): - type(str("SouthPonies"), (models.Model,), body) + type("SouthPonies", (models.Model,), body) # If it doesn't appear to be a reloaded module then we expect # a RuntimeError. body = {} - body['Meta'] = type(str("Meta"), tuple(), meta_contents) + body['Meta'] = type("Meta", tuple(), meta_contents) body['__module__'] = TotallyNormal.__module__ + '.whatever' with self.assertRaisesMessage(RuntimeError, "Conflicting 'southponies' models in application 'apps':"): - type(str("SouthPonies"), (models.Model,), body) + type("SouthPonies", (models.Model,), body) def test_get_containing_app_config_apps_not_ready(self): """ |