Merge branch 'nightly' into fix/unvendor

This commit is contained in:
Labrys of Knossos 2018-12-15 15:21:14 -05:00
commit 05c3de0f36
218 changed files with 40366 additions and 2132 deletions

View file

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