Set PYTHON2 global variable

plexpy/__init__.py

@@ -37,9 +37,10 @@ from apscheduler.triggers.interval import IntervalTrigger
 from UniversalAnalytics import Tracker
 import pytz
 
-PYTHON_VERSION = sys.version_info[0]
+PYTHON_VERSION = sys.version_info[:3]
+PYTHON2 = PYTHON_VERSION[0] == 2
 
-if PYTHON_VERSION < 3:
+if PYTHON2:
     import activity_handler
     import activity_pinger
     import common

plexpy/activity_handler.py

@@ -25,7 +25,7 @@ from apscheduler.triggers.date import DateTrigger
 import pytz
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_processor
     import datafactory
     import helpers

plexpy/activity_pinger.py

@@ -20,7 +20,7 @@ import threading
 import time
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_handler
     import activity_processor
     import database

plexpy/activity_processor.py

@@ -22,7 +22,7 @@ import json
 import time
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import database
     import helpers
     import libraries

plexpy/api2.py

@@ -33,7 +33,7 @@ import cherrypy
 import xmltodict
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import config
     import database
     import helpers

plexpy/classes.py

@@ -25,7 +25,7 @@ from __future__ import unicode_literals
 from future.moves.urllib.request import FancyURLopener
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     from common import USER_AGENT
 else:
     from plexpy.common import USER_AGENT

plexpy/common.py

@@ -22,7 +22,7 @@ import platform
 from collections import OrderedDict
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import version
 else:
     from plexpy import version

plexpy/config.py

@@ -26,7 +26,7 @@ import time
 from configobj import ConfigObj
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
 else:
     from plexpy import logger

plexpy/database.py

@@ -24,7 +24,7 @@ import threading
 import time
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
 else:
     from plexpy import logger

plexpy/datafactory.py

@@ -26,7 +26,7 @@ import json
 from itertools import groupby
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import datatables

plexpy/datatables.py

@@ -19,7 +19,7 @@ from future.builtins import object
 import re
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import database
     import helpers
     import logger

plexpy/graphs.py

@@ -23,7 +23,7 @@ from future.builtins import object
 import datetime
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import logger

plexpy/helpers.py

@@ -60,7 +60,7 @@ from xml.dom import minidom
 import xmltodict
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
     import request
     from api2 import API2
@@ -1265,10 +1265,10 @@ def split_args(args=None):
     if isinstance(args, list):
         return args
     elif isinstance(args, str):
-        if plexpy.PYTHON_VERSION < 3:
+        if plexpy.PYTHON2:
             args = args.encode('utf-8')
         args = shlex.split(args)
-        if plexpy.PYTHON_VERSION < 3:
+        if plexpy.PYTHON2:
             args = [a.decode('utf-8') for a in args]
         return args
     return []

plexpy/http_handler.py

@@ -27,7 +27,7 @@ import certifi
 import urllib3
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import helpers
     import logger
 else:

plexpy/libraries.py

@@ -24,7 +24,7 @@ import json
 import os
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import datatables

plexpy/lock.py

@@ -23,7 +23,7 @@ import time
 import threading
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
 else:
     from plexpy import logger

plexpy/log_reader.py

@@ -21,7 +21,7 @@ from io import open
 import os
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import helpers
     import logger
 else:

plexpy/logger.py

@@ -33,7 +33,7 @@ import threading
 import traceback
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     from helpers import is_public_ip
     from config import _BLACKLIST_KEYS, _WHITELIST_KEYS
 else:

plexpy/mobile_app.py

@@ -21,7 +21,7 @@ from future.builtins import str
 import time
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import database
     import helpers
     import logger

plexpy/newsletter_handler.py

@@ -24,7 +24,7 @@ from apscheduler.triggers.cron import CronTrigger
 import email.utils
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import database
     import helpers
     import logger

plexpy/newsletters.py

@@ -30,7 +30,7 @@ import os
 import re
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import helpers

plexpy/notification_handler.py

@@ -42,7 +42,7 @@ import time
 import musicbrainzngs
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_processor
     import common
     import database
@@ -1785,7 +1785,7 @@ class CustomFormatter(Formatter):
                 obj = self.convert_field(obj, conversion)
 
                 # expand the format spec, if needed
-                if plexpy.PYTHON_VERSION < 3:
+                if plexpy.PYTHON2:
                     format_spec = self._vformat(format_spec, args, kwargs,
                                                 used_args, recursion_depth - 1)
                 else:
@@ -1804,7 +1804,7 @@ class CustomFormatter(Formatter):
                         result.append(suffix)
                 # result.append(self.format_field(obj, format_spec))
 
-        if plexpy.PYTHON_VERSION < 3:
+        if plexpy.PYTHON2:
             return ''.join(result)
         else:
             return ''.join(result), auto_arg_index

plexpy/notifiers.py

@@ -59,7 +59,7 @@ import facebook
 import twitter
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import helpers
@@ -2814,7 +2814,7 @@ class SCRIPTS(Notifier):
         if self.pythonpath:
             custom_env['PYTHONPATH'] = os.pathsep.join([p for p in sys.path if p])
 
-        if plexpy.PYTHON_VERSION < 3:
+        if plexpy.PYTHON2:
             custom_env = {k.encode('utf-8'): v.encode('utf-8') for k, v in custom_env.items()}
 
         env = os.environ.copy()
@@ -2914,7 +2914,7 @@ class SCRIPTS(Notifier):
 
         script.extend(script_args)
 
-        if plexpy.PYTHON_VERSION < 3:
+        if plexpy.PYTHON2:
             script = [s.encode(plexpy.SYS_ENCODING, 'ignore') for s in script]
 
         logger.debug("Tautulli Notifiers :: Full script is: %s" % script)

plexpy/plexivity_import.py

@@ -23,7 +23,7 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_pinger
     import activity_processor
     import database

plexpy/plextv.py

@@ -24,7 +24,7 @@ import base64
 import json
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import helpers
     import http_handler

plexpy/plexwatch_import.py

@@ -22,7 +22,7 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_pinger
     import activity_processor
     import database

plexpy/pmsconnect.py

@@ -26,7 +26,7 @@ import time
 from future.moves.urllib.parse import quote, quote_plus, urlencode
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_processor
     import common
     import helpers

plexpy/request.py

@@ -25,7 +25,7 @@ import collections
 import requests
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import lock
     import logger
 else:

plexpy/session.py

@@ -21,7 +21,7 @@ from future.builtins import str
 import cherrypy
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import users
 else:

plexpy/users.py

@@ -24,7 +24,7 @@ import httpagentparser
 import time
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import database
     import datatables

plexpy/versioncheck.py

@@ -28,7 +28,7 @@ import subprocess
 import tarfile
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import common
     import logger
     import request

plexpy/web_socket.py

@@ -27,7 +27,7 @@ import time
 import websocket
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_handler
     import activity_pinger
     import activity_processor

plexpy/webauth.py

@@ -30,7 +30,7 @@ from hashing_passwords import check_hash
 import jwt
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
     from database import MonitorDatabase
     from users import Users, refresh_users

plexpy/webserve.py

@@ -41,7 +41,7 @@ import mako.exceptions
 import websocket
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import activity_pinger
     import common
     import config

plexpy/webstart.py

@@ -21,7 +21,7 @@ import sys
 import cherrypy
 
 import plexpy
-if plexpy.PYTHON_VERSION < 3:
+if plexpy.PYTHON2:
     import logger
     import webauth
     from helpers import create_https_certificates