innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #22399 -- Forced fixture reading in binary mode 

This might help on systems where default encoding is not UTF-8 (and
on Python 3).
Thanks bacilla for the report.
This commit is contained in:
Claude Paroz 2014-04-18 17:51:13 +02:00
parent c2b269df6e
commit ed532a6a1e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/loaddata.py
View File

@ -125,7 +125,8 @@ class Command(BaseCommand):
for fixture_file, fixture_dir, fixture_name in self.find_fixtures(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)) _, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file))
open_method = self.compression_formats[cmp_fmt] open_method = self.compression_formats[cmp_fmt]
fixture = open_method(fixture_file, 'r') # Forcing binary mode may be revisited after dropping Python 2 support (see #22399)
fixture = open_method(fixture_file, 'rb')
try: try:
self.fixture_count += 1 self.fixture_count += 1
objects_in_fixture = 0 objects_in_fixture = 0