summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-07-25 09:09:15 -0700
committerAndrew Godwin <andrew@aeracode.org>2014-07-25 09:11:01 -0700
commit2bacc9f3b70e45b172675452b7dd32900fbb8a8b (patch)
tree6c387a680d5e0be654dd10d98b9e761e27f72604 /django
parent6e7e5bacd51d1ab4411c58eea04a137639a0a354 (diff)
[1.7.x] Mark initial_data as deprecated separately from syncdb. Refs #23077.
Conflicts: docs/internals/deprecation.txt
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/loaddata.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index a41e433f0a..dca3069ef7 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -18,6 +18,7 @@ from django.utils import lru_cache
from django.utils.encoding import force_text
from django.utils.functional import cached_property
from django.utils._os import upath
+from django.utils.deprecation import RemovedInDjango19Warning
from itertools import product
try:
@@ -223,6 +224,11 @@ class Command(BaseCommand):
if fixture_name != 'initial_data' and not fixture_files:
# Warning kept for backwards-compatibility; why not an exception?
warnings.warn("No fixture named '%s' found." % fixture_name)
+ elif fixture_name == 'initial_data':
+ warnings.warn(
+ 'initial_data fixtures are deprecated. Use data migrations instead.',
+ RemovedInDjango19Warning
+ )
return fixture_files