From 76a00b249316bc577d52cb385534cfff257a103b Mon Sep 17 00:00:00 2001 From: Labrys Date: Sat, 4 Jun 2016 23:01:15 -0400 Subject: [PATCH] Convert to new-style class by inheriting from object --- core/logger.py | 2 +- core/nzbToMediaConfig.py | 2 +- core/nzbToMediaDB.py | 2 +- core/nzbToMediaUtil.py | 6 +++--- core/versionCheck.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/logger.py b/core/logger.py index b3800a98..86772c15 100644 --- a/core/logger.py +++ b/core/logger.py @@ -236,7 +236,7 @@ class NTMRotatingLogHandler(object): sys.exit(1) -class DispatchingFormatter: +class DispatchingFormatter(object): def __init__(self, formatters, default_formatter): self._formatters = formatters self._default_formatter = default_formatter diff --git a/core/nzbToMediaConfig.py b/core/nzbToMediaConfig.py index 6303a698..badc597f 100644 --- a/core/nzbToMediaConfig.py +++ b/core/nzbToMediaConfig.py @@ -11,7 +11,7 @@ from core import logger from itertools import chain -class Section(configobj.Section): +class Section(configobj.Section, object): def isenabled(section): # checks if subsection enabled, returns true/false if subsection specified otherwise returns true/false in {} if not section.sections: diff --git a/core/nzbToMediaDB.py b/core/nzbToMediaDB.py index e11b7dbb..c8a22318 100644 --- a/core/nzbToMediaDB.py +++ b/core/nzbToMediaDB.py @@ -23,7 +23,7 @@ def dbFilename(filename="nzbtomedia.db", suffix=None): return core.os.path.join(core.PROGRAM_DIR, filename) -class DBConnection: +class DBConnection(object): def __init__(self, filename="nzbtomedia.db", suffix=None, row_type=None): self.filename = filename diff --git a/core/nzbToMediaUtil.py b/core/nzbToMediaUtil.py index 0c81cbe8..3f8f0f7e 100644 --- a/core/nzbToMediaUtil.py +++ b/core/nzbToMediaUtil.py @@ -1229,7 +1229,7 @@ def get_downloadInfo(inputName, status): return sqlResults -class RunningProcess(): +class RunningProcess(object): """ Limits application to single instance """ def __init__(self): @@ -1245,7 +1245,7 @@ class RunningProcess(): # self.process.__del__() -class WindowsProcess(): +class WindowsProcess(object): def __init__(self): self.mutexname = "nzbtomedia_" + core.PID_FILE.replace('\\', '/') # {D0E858DF-985E-4907-B7FB-8D732C3FC3B9}" if platform.system() == 'Windows': @@ -1271,7 +1271,7 @@ class WindowsProcess(): self.CloseHandle(self.mutex) -class PosixProcess(): +class PosixProcess(object): def __init__(self): self.pidpath = core.PID_FILE self.lock_socket = None diff --git a/core/versionCheck.py b/core/versionCheck.py index f3cd3c1e..fd58af45 100644 --- a/core/versionCheck.py +++ b/core/versionCheck.py @@ -17,7 +17,7 @@ import core from core import logger -class CheckVersion(): +class CheckVersion(object): """ Version check class meant to run as a thread object with the SB scheduler. """ @@ -82,7 +82,7 @@ class CheckVersion(): return self.updater.update() -class UpdateManager(): +class UpdateManager(object): def get_github_repo_user(self): return core.GIT_USER