Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unicode fixes

Browse Source
This commit is contained in:
Abdallah
2014-06-19 19:59:15 +03:00
committed by Ned Batchelder
parent e8d264f870
commit cf16975bd2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/djangoapps/contentstore/views/import_export.py
View File

@@ -324,11 +324,11 @@ def export_handler(request, course_key_string):
try:
export_to_xml(modulestore(), contentstore(), course_module.id, root_dir, name)
logging.debug('tar file being generated at {0}'.format(export_file.name))
logging.debug(u'tar file being generated at {0}'.format(export_file.name))
with tarfile.open(name=export_file.name, mode='w:gz') as tar_file:
tar_file.add(root_dir / name, arcname=name)
except SerializationError as exc:
log.exception('There was an error exporting course %s', course_module.id)
log.exception(u'There was an error exporting course %s', course_module.id)
unit = None
failed_item = None
parent = None
@@ -369,7 +369,7 @@ def export_handler(request, course_key_string):
wrapper = FileWrapper(export_file)
response = HttpResponse(wrapper, content_type='application/x-tgz')
response['Content-Disposition'] = 'attachment; filename=%s' % os.path.basename(export_file.name)
response['Content-Disposition'] = 'attachment; filename=%s' % os.path.basename(unicode(export_file.name).encode('utf-8'))
response['Content-Length'] = os.path.getsize(export_file.name)
return response