summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-13 19:28:42 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-17 10:17:45 +0100
commit259cd3cd41a80a4725d669fa73498dbfe55a6fdf (patch)
tree7ef95373e716897398c99adbdbae4070dd31bf8d /django/core
parentda36d03fe69c35e2f289590c8c44c4c0d1281f24 (diff)
Deprecated get_app_package, get_app_path and get_app_paths.
Diffstat (limited to 'django/core')
-rw-r--r--django/core/management/commands/loaddata.py4
-rw-r--r--django/core/management/sql.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index 64a57fbc79..bfeba68aa6 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -230,8 +230,8 @@ class Command(BaseCommand):
current directory.
"""
dirs = []
- for path in app_cache.get_app_paths():
- d = os.path.join(path, 'fixtures')
+ for app_config in app_cache.get_app_configs():
+ d = os.path.join(app_config.path, 'fixtures')
if os.path.isdir(d):
dirs.append(d)
dirs.extend(list(settings.FIXTURE_DIRS))
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index bcd4769dde..36ee5760e1 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -169,7 +169,7 @@ def _split_statements(content):
def custom_sql_for_model(model, style, connection):
opts = model._meta
app_dirs = []
- app_dir = app_cache.get_app_path(model._meta.app_label)
+ app_dir = app_cache.get_app_config(model._meta.app_label).path
app_dirs.append(os.path.normpath(os.path.join(app_dir, 'sql')))
# Deprecated location -- remove in Django 1.9