anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update export json and csv for Python 2

Browse Source
This commit is contained in:
JonnyWong16
2020-08-04 12:13:47 -07:00
parent ed454b2a4a
commit 6fb3a3a3c8
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plexpy/exporter.py
View File

@@ -17,8 +17,8 @@
from __future__ import unicode_literals
from future.builtins import str
from backports import csv
import csv
import json
import os
import threading
@@ -941,23 +941,14 @@ def _real_export(export_id, items, attrs, file_format, filename):
result = pool.map(part, items)
if file_format == 'json':
if plexpy.PYTHON2:
kw = {'mode': 'wb'}
else:
kw = {'mode': 'w', 'encoding': 'utf-8'}
with open(filepath, **kw) as outfile:
json.dump(result, outfile, indent=4, ensure_ascii=False, sort_keys=True)
json_data = json.dumps(result, indent=4, ensure_ascii=False, sort_keys=True)
with open(filepath, 'w', encoding='utf-8') as outfile:
outfile.write(json_data)
elif file_format == 'csv':
if plexpy.PYTHON2:
kw = {'mode': 'wb'}
else:
kw = {'mode': 'w', 'encoding': 'utf-8', 'newline': ''}
flatten_result = helpers.flatten_dict(result)
flatten_attrs = set().union(*flatten_result)
with open(filepath, **kw) as outfile:
with open(filepath, 'w', encoding='utf-8', newline='') as outfile:
writer = csv.DictWriter(outfile, sorted(flatten_attrs))
writer.writeheader()
writer.writerows(flatten_result)