diff options
| author | Claude Paroz <claude@2xlibre.net> | 2014-04-18 17:51:13 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-04-18 17:56:14 +0200 |
| commit | 8d7023dc714acc957fac7ef422ccee4d83429b09 (patch) | |
| tree | a06ce38147283e2c50741fafd214faaf3ab8b2a9 | |
| parent | 3a4a5a5c99909c1a9f496a3f6f299b6d535e4b50 (diff) | |
[1.7.x] 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.
Backport of ed532a6a1 from master.
| -rw-r--r-- | django/core/management/commands/loaddata.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index 7a008bca08..9cc9324b35 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -125,7 +125,8 @@ class Command(BaseCommand): 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] - 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: self.fixture_count += 1 objects_in_fixture = 0 |