summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2013-08-20 19:03:33 +0200
committerAndrew Godwin <andrew@aeracode.org>2013-08-21 22:32:04 +0100
commit839940f27f25c2dafaa5b2ec934c2dd6b80903e8 (patch)
tree7199a10975970768d4a1a8ab3478ea7f09b42d2b /django
parent1db5fce1eee27cb260b47d3c631ee8f8d02de8c2 (diff)
Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/loaddata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index 0da36a3c52..a6e22d9173 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -183,7 +183,7 @@ class Command(BaseCommand):
if self.verbosity >= 2:
self.stdout.write("Loading '%s' fixtures..." % fixture_name)
- if os.path.isabs(fixture_name):
+ if os.path.sep in fixture_name:
fixture_dirs = [os.path.dirname(fixture_name)]
fixture_name = os.path.basename(fixture_name)
else: