Changeset 9537

Timestamp:

11/30/08 20:20:59 (1 month ago)

Author:

mtredinnick

Message:

Fixed #9723 -- Not all Python distributions contain the bz2 module, so we need to allow for that. Based on a patch from AdamG.

Files:

• django/trunk/django/core/management/commands/loaddata.py (modified) (2 diffs)

django/trunk/django/core/management/commands/loaddata.py

@@ -10 +10 @@
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
+
+try:
+    import bz2
+    has_bz2 = True
+except ImportError:
+    has_bz2 = False
-
-class Command(BaseCommand):
@@ -63 +69 @@
-        compression_types = {
-            None:   file,
-            'bz2':  bz2.BZ2File,
-            'gz':   gzip.GzipFile,
-            'zip':  SingleZipReader
-        }
+        if has_bz2:
+            compression_types['bz2'] = bz2.BZ2File
-
-        app_fixtures = [os.path.join(os.path.dirname(app.__file__), 'fixtures') for app in get_apps()]