More rename, more -python2

jellypy/exporter.py

@@ -14,36 +14,24 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-from future.builtins import str
-from backports import csv
-
+import csv
 import json
 import os
-import requests
 import shutil
 import threading
-
 from functools import partial, reduce
 from io import open
 from multiprocessing.dummy import Pool as ThreadPool
 
+import requests
+
 import jellypy
-if jellypy.PYTHON2:
-    import database
-    import datatables
-    import helpers
-    import logger
-    import users
-    from plex import Plex
-else:
-    from jellypy import database
-    from jellypy import datatables
-    from jellypy import helpers
-    from jellypy import logger
-    from jellypy import users
-    from jellypy.plex import Plex
+from jellypy import database
+from jellypy import datatables
+from jellypy import helpers
+from jellypy import logger
+from jellypy import users
+from jellypy.plex import Plex
 
 
 class Export(object):