diff options
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/management/commands/dumpdata.py | 7 | ||||
| -rw-r--r-- | django/core/serializers/python.py | 3 | ||||
| -rw-r--r-- | django/core/serializers/xml_serializer.py | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py index 1242bd4e57..eb5d9ffd50 100644 --- a/django/core/management/commands/dumpdata.py +++ b/django/core/management/commands/dumpdata.py @@ -65,9 +65,8 @@ class Command(BaseCommand): excluded_models = set() for exclude in excludes: if '.' in exclude: - app_label, model_name = exclude.split('.', 1) try: - model = apps.get_model(app_label, model_name) + model = apps.get_model(exclude) except LookupError: raise CommandError('Unknown model in excludes: %s' % exclude) excluded_models.add(model) @@ -98,7 +97,7 @@ class Command(BaseCommand): if app_config.models_module is None or app_config in excluded_apps: continue try: - model = apps.get_model(app_label, model_label) + model = app_config.get_model(model_label) except LookupError: raise CommandError("Unknown model: %s.%s" % (app_label, model_label)) @@ -177,7 +176,7 @@ def sort_dependencies(app_list): if hasattr(model, 'natural_key'): deps = getattr(model.natural_key, 'dependencies', []) if deps: - deps = [apps.get_model(*d.split('.')) for d in deps] + deps = [apps.get_model(dep) for dep in deps] else: deps = [] diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 3d14a1b509..249dc5a054 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -153,7 +153,6 @@ def _get_model(model_identifier): Helper to look up a model from an "app_label.model_name" string. """ try: - Model = apps.get_model(*model_identifier.split(".")) + return apps.get_model(model_identifier) except (LookupError, TypeError): raise base.DeserializationError("Invalid model identifier: '%s'" % model_identifier) - return Model diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py index 06dd134754..a23e74454f 100644 --- a/django/core/serializers/xml_serializer.py +++ b/django/core/serializers/xml_serializer.py @@ -277,12 +277,11 @@ class Deserializer(base.Deserializer): "<%s> node is missing the required '%s' attribute" % (node.nodeName, attr)) try: - Model = apps.get_model(*model_identifier.split(".")) + return apps.get_model(model_identifier) except (LookupError, TypeError): raise base.DeserializationError( "<%s> node has invalid model identifier: '%s'" % (node.nodeName, model_identifier)) - return Model def getInnerText(node): |