summaryrefslogtreecommitdiff
path: root/django/core/serializers/python.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
commit1716b7ce5a02b2a77188dfea2d41e25dfa58821c (patch)
treef3422c0d6725f45756a3b9deb32406d319b8a72e /django/core/serializers/python.py
parente9e522a8e7455900a775678e5d6bc518a289b8d1 (diff)
downloaddjango-1716b7ce5a02b2a77188dfea2d41e25dfa58821c.tar.gz
Renamed AppCache to Apps.
Also renamed app_cache to apps and "app cache" to "app registry". Deprecated AppCache.app_cache_ready() in favor of Apps.ready().
Diffstat (limited to 'django/core/serializers/python.py')
-rw-r--r--django/core/serializers/python.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py
index c8a2b7eff2..a46adeef7a 100644
--- a/django/core/serializers/python.py
+++ b/django/core/serializers/python.py
@@ -5,7 +5,7 @@ other serializers.
"""
from __future__ import unicode_literals
-from django.apps import app_cache
+from django.apps import apps
from django.conf import settings
from django.core.serializers import base
from django.db import models, DEFAULT_DB_ALIAS
@@ -88,7 +88,7 @@ def Deserializer(object_list, **options):
db = options.pop('using', DEFAULT_DB_ALIAS)
ignore = options.pop('ignorenonexistent', False)
- app_cache.populate_models()
+ apps.populate_models()
for d in object_list:
# Look up the model and starting build a dict of data for it.
@@ -155,7 +155,7 @@ def _get_model(model_identifier):
Helper to look up a model from an "app_label.model_name" string.
"""
try:
- Model = app_cache.get_model(*model_identifier.split("."))
+ Model = apps.get_model(*model_identifier.split("."))
except TypeError:
Model = None
if Model is None: