From 6fb3a3a3c88a7a3f371b278f6db3f6116bb749f3 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Tue, 4 Aug 2020 12:13:47 -0700
Subject: [PATCH] Update export json and csv for Python 2

---
 plexpy/exporter.py | 19 +++++--------------
 plexpy/webserve.py |  6 +++---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/plexpy/exporter.py b/plexpy/exporter.py
index 5aa2bb92..70e979c7 100644
--- a/plexpy/exporter.py
+++ b/plexpy/exporter.py
@@ -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)
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index d1f457f7..fcadf92f 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -19,10 +19,10 @@ from __future__ import unicode_literals
 from future.builtins import next
 from future.builtins import object
 from future.builtins import str
+from backports import csv
 
 from io import open
 import base64
-import csv
 import json
 import linecache
 import os
@@ -6538,8 +6538,8 @@ class WebInterface(object):
                 return serve_file(exporter.get_export_filepath(result['filename']), name=result['filename'],
                                   content_type='application/json')
             elif result['file_format'] == 'csv':
-                with open(exporter.get_export_filepath(result['filename']), 'r', encoding='utf-8') as f:
-                    reader = csv.DictReader(f)
+                with open(exporter.get_export_filepath(result['filename']), 'r', encoding='utf-8') as infile:
+                    reader = csv.DictReader(infile)
                     table = '<table><tr><th>' + \
                             '</th><th>'.join(reader.fieldnames) + \
                             '</th></tr><tr>' + \