summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBojan Mihelac <bmihelac@mihelac.org>2015-04-22 11:00:04 (GMT)
committerBojan Mihelac <bmihelac@mihelac.org>2015-04-22 11:00:04 (GMT)
commitd331cb56cc85e46b2c1554af08fb6771093a97f5 (patch)
tree7023ef5ab95724165338bfc9d11a5daf7175e276
parent005967c448d568424033f671cfacddd975a13ee5 (diff)
downloaddjango-import-export-d331cb56cc85e46b2c1554af08fb6771093a97f5.zip
django-import-export-d331cb56cc85e46b2c1554af08fb6771093a97f5.tar.gz
django-import-export-d331cb56cc85e46b2c1554af08fb6771093a97f5.tar.bz2
Revert "Merge pull request #245 from pkozlov/pkozlov-to_encoding"
This reverts commit e31c9669870d5a70fde94065d5a04256b7052b99, reversing changes made to a4ea2cf9ece508fc28fbd29b82e87e4e7f8d5995.
-rw-r--r--import_export/admin.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/import_export/admin.py b/import_export/admin.py
index aff1a49..8d1c83a 100644
--- a/import_export/admin.py
+++ b/import_export/admin.py
@@ -318,8 +318,6 @@ class ExportMixin(ImportExportMixinBase):
queryset = self.get_export_queryset(request)
export_data = self.get_export_data(file_format, queryset)
- if not file_format.is_binary() and self.to_encoding:
- export_data = export_data.encode(self.to_encoding)
content_type = file_format.get_content_type()
# Django 1.7 uses the content_type kwarg instead of mimetype
try: