Merge branch 'nightly' into fix/unvendor

core/__init__.py

@@ -5,10 +5,10 @@ from __future__ import print_function
 import itertools
 import locale
 import os
+import platform
 import re
 import subprocess
 import sys
-import platform
 import time
 
 
@@ -31,23 +31,25 @@ CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg')
 TEST_FILE = os.path.join(os.path.join(PROGRAM_DIR, 'tests'), 'test.mp4')
 MYAPP = None
 
+import six
 from six.moves import reload_module
 
+from core import logger, nzbToMediaDB, versionCheck
 from core.autoProcess.autoProcessComics import autoProcessComics
 from core.autoProcess.autoProcessGames import autoProcessGames
 from core.autoProcess.autoProcessMovie import autoProcessMovie
 from core.autoProcess.autoProcessMusic import autoProcessMusic
 from core.autoProcess.autoProcessTV import autoProcessTV
-from core import logger, versionCheck, nzbToMediaDB
+from core.databases import mainDB
 from core.nzbToMediaConfig import config
 from core.nzbToMediaUtil import (
-    category_search, sanitizeName, copy_link, parse_args, flatten, getDirs,
-    rmReadOnly, rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles,
-    extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanDir,
-    create_torrent_class, listMediaFiles, RunningProcess,
- )
+    RunningProcess, WakeUp, category_search, cleanDir, cleanDir, copy_link,
+    create_torrent_class, extractFiles, flatten, getDirs, get_downloadInfo,
+    listMediaFiles, makeDir, parse_args, pause_torrent, remove_torrent,
+    resume_torrent, rmDir, rmReadOnly, sanitizeName, update_downloadInfoStatus,
+)
 from core.transcoder import transcoder
-from core.databases import mainDB
+
 
 # Client Agents
 NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']
@@ -269,21 +271,22 @@ def initialize(section=None):
     if not SYS_ENCODING or SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
         SYS_ENCODING = 'UTF-8'
 
-    if not hasattr(sys, "setdefaultencoding"):
-        reload_module(sys)
+    if six.PY2:
+        if not hasattr(sys, "setdefaultencoding"):
+            reload_module(sys)
 
-    try:
-        # pylint: disable=E1101
-        # On non-unicode builds this will raise an AttributeError, if encoding type is not valid it throws a LookupError
-        sys.setdefaultencoding(SYS_ENCODING)
-    except:
-        print('Sorry, you MUST add the nzbToMedia folder to the PYTHONPATH environment variable'
-              '\nor find another way to force Python to use {codec} for string encoding.'.format
-              (codec=SYS_ENCODING))
-        if 'NZBOP_SCRIPTDIR' in os.environ:
-            sys.exit(NZBGET_POSTPROCESS_ERROR)
-        else:
-            sys.exit(1)
+        try:
+            # pylint: disable=E1101
+            # On non-unicode builds this will raise an AttributeError, if encoding type is not valid it throws a LookupError
+            sys.setdefaultencoding(SYS_ENCODING)
+        except:
+            print('Sorry, you MUST add the nzbToMedia folder to the PYTHONPATH environment variable'
+                  '\nor find another way to force Python to use {codec} for string encoding.'.format
+                  (codec=SYS_ENCODING))
+            if 'NZBOP_SCRIPTDIR' in os.environ:
+                sys.exit(NZBGET_POSTPROCESS_ERROR)
+            else:
+                sys.exit(1)
 
     # init logging
     logger.ntm_log_instance.initLogging()

core/autoProcess/autoProcessComics.py

@@ -1,11 +1,12 @@
 # coding=utf-8
 
 import os
-import core
+
 import requests
 
-from core.nzbToMediaUtil import convert_to_ascii, remoteDir, server_responding
+import core
 from core import logger
+from core.nzbToMediaUtil import convert_to_ascii, remoteDir, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/autoProcess/autoProcessGames.py

@@ -1,12 +1,13 @@
 # coding=utf-8
 
 import os
-import core
-import requests
 import shutil
 
-from core.nzbToMediaUtil import convert_to_ascii, server_responding
+import requests
+
+import core
 from core import logger
+from core.nzbToMediaUtil import convert_to_ascii, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/autoProcess/autoProcessMovie.py

@@ -1,14 +1,15 @@
 # coding=utf-8
 
+import json
 import os
 import time
-import requests
-import json
-import core
 
-from core.nzbToMediaSceneExceptions import process_all_exceptions
-from core.nzbToMediaUtil import convert_to_ascii, rmDir, find_imdbid, find_download, listMediaFiles, remoteDir, import_subs, server_responding, reportNzb
+import requests
+
+import core
 from core import logger
+from core.nzbToMediaSceneExceptions import process_all_exceptions
+from core.nzbToMediaUtil import convert_to_ascii, find_download, find_imdbid, import_subs, listMediaFiles, remoteDir, reportNzb, rmDir, server_responding
 from core.transcoder import transcoder
 
 requests.packages.urllib3.disable_warnings()

core/autoProcess/autoProcessMusic.py

@@ -1,14 +1,15 @@
 # coding=utf-8
 
+import json
 import os
 import time
-import requests
-import core
-import json
 
-from core.nzbToMediaUtil import convert_to_ascii, rmDir, remoteDir, listMediaFiles, server_responding
-from core.nzbToMediaSceneExceptions import process_all_exceptions
+import requests
+
+import core
 from core import logger
+from core.nzbToMediaSceneExceptions import process_all_exceptions
+from core.nzbToMediaUtil import convert_to_ascii, listMediaFiles, remoteDir, rmDir, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/autoProcess/autoProcessTV.py

@@ -1,17 +1,18 @@
 # coding=utf-8
 
 import copy
+import errno
+import json
 import os
 import time
-import errno
-import requests
-import json
-import core
 
+import requests
+
+import core
+from core import logger
 from core.nzbToMediaAutoFork import autoFork
 from core.nzbToMediaSceneExceptions import process_all_exceptions
-from core.nzbToMediaUtil import convert_to_ascii, flatten, rmDir, listMediaFiles, remoteDir, import_subs, server_responding, reportNzb
-from core import logger
+from core.nzbToMediaUtil import convert_to_ascii, flatten, import_subs, listMediaFiles, remoteDir, reportNzb, rmDir, server_responding
 from core.transcoder import transcoder
 
 requests.packages.urllib3.disable_warnings()

core/databases/__init__.py

@@ -1,2 +1 @@
 # coding=utf-8
-__all__ = ["mainDB"]

core/extractor/extractor.py

@@ -4,10 +4,11 @@ import os
 import platform
 import shutil
 import stat
-from time import sleep
-import core
-from subprocess import call, Popen
 import subprocess
+from subprocess import Popen, call
+from time import sleep
+
+import core
 
 
 def extract(filePath, outputDestination):

core/logger.py

@@ -1,10 +1,10 @@
 # coding=utf-8
-from __future__ import with_statement
 
+import logging
 import os
 import sys
 import threading
-import logging
+
 import core
 
 # number of log files to keep

core/nzbToMediaAutoFork.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 
 import requests
-
 from six import iteritems
 
 import core

core/nzbToMediaConfig.py

@@ -1,15 +1,16 @@
 # coding=utf-8
 
-from six import iteritems
+import copy
 import os
 import shutil
-import copy
-import core
-from configobj import *
-from core import logger
-
 from itertools import chain
 
+import configobj
+from six import iteritems
+
+import core
+from core import logger
+
 
 class Section(configobj.Section, object):
     def isenabled(section):

core/nzbToMediaDB.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 
-from __future__ import print_function, with_statement
+from __future__ import print_function
 
 import re
 import sqlite3

core/nzbToMediaSceneExceptions.py

@@ -1,10 +1,12 @@
 # coding=utf-8
+
 import os
-import re
-import core
-import shlex
 import platform
+import re
+import shlex
 import subprocess
+
+import core
 from core import logger
 from core.nzbToMediaUtil import listMediaFiles
 

core/nzbToMediaUserScript.py

@@ -1,10 +1,12 @@
 # coding=utf-8
+
 import os
-import core
 from subprocess import Popen
-from core.transcoder import transcoder
-from core.nzbToMediaUtil import import_subs, listMediaFiles, rmDir
+
+import core
 from core import logger
+from core.nzbToMediaUtil import import_subs, listMediaFiles, rmDir
+from core.transcoder import transcoder
 
 
 def external_script(outputDestination, torrentName, torrentLabel, settings):

core/nzbToMediaUtil.py

@@ -1314,11 +1314,18 @@ class RunningProcess(object):
 
 class WindowsProcess(object):
     def __init__(self):
+        self.mutex = None
         self.mutexname = "nzbtomedia_{pid}".format(pid=core.PID_FILE.replace('\\', '/'))  # {D0E858DF-985E-4907-B7FB-8D732C3FC3B9}"
         if platform.system() == 'Windows':
-            from win32event import CreateMutex
-            from win32api import CloseHandle, GetLastError
-            from winerror import ERROR_ALREADY_EXISTS
+            try:
+                from win32.win32event import CreateMutex
+                from win32.win32api import CloseHandle, GetLastError
+                from win32.lib.winerror import ERROR_ALREADY_EXISTS
+            except ImportError:
+                from win32event import CreateMutex
+                from win32api import CloseHandle, GetLastError
+                from winerror import ERROR_ALREADY_EXISTS
+
             self.CreateMutex = CreateMutex
             self.CloseHandle = CloseHandle
             self.GetLastError = GetLastError

core/transcoder/transcoder.py

@@ -1,17 +1,19 @@
 # coding=utf-8
 
-from six import iteritems
 import errno
+import json
 import os
 import platform
-import subprocess
-import core
-import json
-import shutil
 import re
+import shutil
+import subprocess
+
+from babelfish import Language
+from six import iteritems
+
+import core
 from core import logger
 from core.nzbToMediaUtil import makeDir
-from babelfish import Language
 
 
 def isVideoGood(videofile, status):

core/versionCheck.py

@@ -4,17 +4,16 @@
 
 import os
 import platform
-import shutil
-import subprocess
 import re
-import urllib
-import tarfile
+import shutil
 import stat
+import subprocess
+import tarfile
 import traceback
-import gh_api as github
+import urllib
 
 import core
-from core import logger
+from core import gh_api as github, logger
 
 
 class CheckVersion(object):
@@ -182,6 +181,7 @@ class GitUpdateManager(UpdateManager):
 
             if output:
                 output = output.strip()
+                output = output.decode('utf-8')
             if core.LOG_GIT:
                 logger.log(u"git output: {output}".format(output=output), logger.DEBUG)