Permalink
Browse files

[1.7.x] Adapted fixture read mode to file type

Binary mode added in ed532a6 is not supported by ZipFile.
Refs #22399.
Backport of 275811a from master.
  • Loading branch information...
claudep committed Apr 18, 2014
1 parent 8d7023d commit 13340df76984d019ff9d4612ed6f38507546aade
Showing with 7 additions and 7 deletions.
  1. +7 −7 django/core/management/commands/loaddata.py
@@ -76,13 +76,14 @@ def loaddata(self, fixture_labels):
self.models = set()
self.serialization_formats = serializers.get_public_serializer_formats()
# Forcing binary mode may be revisited after dropping Python 2 support (see #22399)
self.compression_formats = {
None: open,
'gz': gzip.GzipFile,
'zip': SingleZipReader
None: (open, 'rb'),
'gz': (gzip.GzipFile, 'rb'),
'zip': (SingleZipReader, 'r'),
}
if has_bz2:
self.compression_formats['bz2'] = bz2.BZ2File
self.compression_formats['bz2'] = (bz2.BZ2File, 'r')
with connection.constraint_checks_disabled():
for fixture_label in fixture_labels:
@@ -124,9 +125,8 @@ def load_label(self, fixture_label):
"""
for fixture_file, fixture_dir, fixture_name in self.find_fixtures(fixture_label):
_, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file))
open_method = self.compression_formats[cmp_fmt]
# Forcing binary mode may be revisited after dropping Python 2 support (see #22399)
fixture = open_method(fixture_file, 'rb')
open_method, mode = self.compression_formats[cmp_fmt]
fixture = open_method(fixture_file, mode)
try:
self.fixture_count += 1
objects_in_fixture = 0

0 comments on commit 13340df

Please sign in to comment.