Set PYTHON2 global variable

This commit is contained in:
JonnyWong16 2020-04-04 07:57:51 -07:00
parent fb395fc2e9
commit 9e0153e962
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
35 changed files with 43 additions and 42 deletions

View file

@ -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)