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

Merge pull request #21426 from edx/BOM-190

Browse Source 
BOM-190
This commit is contained in:
Ayub
2019-08-26 09:23:40 +05:00
committed by GitHub
parent 759af1813a 4250c3a0b3
commit 356f92add7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/instructor_analytics/csvs.py
View File

@@ -32,11 +32,11 @@ def create_csv_response(filename, header, datarows):
quotechar='"',
quoting=csv.QUOTE_ALL)
encoded_header = [six.text_type(s).encode('utf-8') for s in header]
encoded_header = [six.text_type(s) for s in header]
csvwriter.writerow(encoded_header)
for datarow in datarows:
encoded_row = [six.text_type(s).encode('utf-8') for s in datarow]
encoded_row = [six.text_type(s) for s in datarow]
csvwriter.writerow(encoded_row)
return response

5
lms/djangoapps/instructor_analytics/tests/test_csvs.py
View File

@@ -81,7 +81,10 @@ class TestAnalyticsFormatDictlist(TestCase):
res = create_csv_response('robot.csv', header, datarows)
self.assertEqual(res['Content-Type'], 'text/csv')
self.assertEqual(res['Content-Disposition'], u'attachment; filename={0}'.format('robot.csv'))
self.assertEqual(res.content.strip(), '"Name","Email"\r\n"Jim","jim@edy.org"\r\n"Jake","jake@edy.org"\r\n"Jeeves","jeeves@edy.org"')
self.assertEqual(
res.content.strip().decode('utf-8'),
'"Name","Email"\r\n"Jim","jim@edy.org"\r\n"Jake","jake@edy.org"\r\n"Jeeves","jeeves@edy.org"'
)
class TestAnalyticsFormatInstances(TestCase):