mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #23919 -- Removed str() conversion of type and method __name__.

Browse source
This commit is contained in:
Simon Charette 2017-01-19 09:48:01 -05:00
parent 41e0033caf
commit 9695b14982
17 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/apps/tests.py
View file

@ -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):
"""