diff --git a/cleanup.py b/cleanup.py index 9628d55c..6629f564 100644 --- a/cleanup.py +++ b/cleanup.py @@ -1,12 +1,5 @@ #!/usr/bin/env python -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import subprocess import sys @@ -30,7 +23,7 @@ FOLDER_STRUCTURE = { } -class WorkingDirectory(object): +class WorkingDirectory: """Context manager for changing current working directory.""" def __init__(self, new, original=None): diff --git a/core/__init__.py b/core/__init__.py index fc2e5860..da1cfb66 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import itertools import locale import os diff --git a/core/auto_process/books.py b/core/auto_process/books.py index 9c908a94..26771b13 100644 --- a/core/auto_process/books.py +++ b/core/auto_process/books.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests import core diff --git a/core/auto_process/comics.py b/core/auto_process/comics.py index e8719bba..e8059d71 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import requests diff --git a/core/auto_process/common.py b/core/auto_process/common.py index 3ed77a2e..6ea5e24e 100644 --- a/core/auto_process/common.py +++ b/core/auto_process/common.py @@ -1,16 +1,9 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests from core import logger -class ProcessResult(object): +class ProcessResult: def __init__(self, message, status_code): self.message = message self.status_code = status_code diff --git a/core/auto_process/games.py b/core/auto_process/games.py index 73907d25..502ca9ba 100644 --- a/core/auto_process/games.py +++ b/core/auto_process/games.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import shutil diff --git a/core/auto_process/managers/sickbeard.py b/core/auto_process/managers/sickbeard.py index 0e63a0a4..ad805cc1 100644 --- a/core/auto_process/managers/sickbeard.py +++ b/core/auto_process/managers/sickbeard.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import copy import core @@ -26,7 +17,7 @@ import six from six import iteritems -class InitSickBeard(object): +class InitSickBeard: """Sickbeard init class. Used to determin which sickbeard fork object to initialize. @@ -316,7 +307,7 @@ class InitSickBeard(object): ) -class SickBeard(object): +class SickBeard: """Sickbeard base class.""" def __init__(self, sb_init): diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index bfee550a..9d0c7b3d 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import json import os import time diff --git a/core/auto_process/music.py b/core/auto_process/music.py index af3bb166..c4fd61e2 100644 --- a/core/auto_process/music.py +++ b/core/auto_process/music.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import json import os import time diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index 84a93427..927d3fb2 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import copy import errno import json diff --git a/core/configuration.py b/core/configuration.py index 1fb05c0c..8f6cb071 100644 --- a/core/configuration.py +++ b/core/configuration.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import copy import os import shutil diff --git a/core/databases.py b/core/databases.py index 50e025f3..82873fac 100644 --- a/core/databases.py +++ b/core/databases.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from core import logger, main_db from core.utils import backup_versioned_file diff --git a/core/extractor/__init__.py b/core/extractor/__init__.py index 67501d92..05a2cfb1 100644 --- a/core/extractor/__init__.py +++ b/core/extractor/__init__.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import platform import shutil diff --git a/core/github_api.py b/core/github_api.py index d61def2f..46b495fd 100644 --- a/core/github_api.py +++ b/core/github_api.py @@ -1,16 +1,7 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests -class GitHub(object): +class GitHub: """Simple api wrapper for the Github API v3.""" def __init__(self, github_repo_user, github_repo, branch='master'): diff --git a/core/logger.py b/core/logger.py index 98b15432..9caa8dbe 100644 --- a/core/logger.py +++ b/core/logger.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import logging import os import sys @@ -36,7 +27,7 @@ reverseNames = {u'ERROR': ERROR, u'DB': DB} -class NTMRotatingLogHandler(object): +class NTMRotatingLogHandler: def __init__(self, log_file, num_files, num_bytes): self.num_files = num_files self.num_bytes = num_bytes @@ -240,7 +231,7 @@ class NTMRotatingLogHandler(object): sys.exit(1) -class DispatchingFormatter(object): +class DispatchingFormatter: def __init__(self, formatters, default_formatter): self._formatters = formatters self._default_formatter = default_formatter diff --git a/core/main_db.py b/core/main_db.py index d9d7c1b9..67bc7df7 100644 --- a/core/main_db.py +++ b/core/main_db.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import re import sqlite3 import time @@ -42,7 +33,6 @@ if PY2: else: from sqlite3 import Row - def db_filename(filename='nzbtomedia.db', suffix=None): """ Return the correct location of the database file. @@ -58,7 +48,7 @@ def db_filename(filename='nzbtomedia.db', suffix=None): return core.os.path.join(core.APP_ROOT, filename) -class DBConnection(object): +class DBConnection: def __init__(self, filename='nzbtomedia.db', suffix=None, row_type=None): self.filename = filename @@ -242,7 +232,7 @@ def sanity_check_database(connection, sanity_check): sanity_check(connection).check() -class DBSanityCheck(object): +class DBSanityCheck: def __init__(self, connection): self.connection = connection @@ -287,7 +277,7 @@ def _process_upgrade(connection, upgrade_class): # Base migration class. All future DB changes should be subclassed from this class -class SchemaUpgrade(object): +class SchemaUpgrade: def __init__(self, connection): self.connection = connection diff --git a/core/plugins/downloaders/nzb/configuration.py b/core/plugins/downloaders/nzb/configuration.py index 62d57ab6..dea81610 100644 --- a/core/plugins/downloaders/nzb/configuration.py +++ b/core/plugins/downloaders/nzb/configuration.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import core diff --git a/core/plugins/downloaders/nzb/utils.py b/core/plugins/downloaders/nzb/utils.py index f5dd29ba..23061c96 100644 --- a/core/plugins/downloaders/nzb/utils.py +++ b/core/plugins/downloaders/nzb/utils.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import requests diff --git a/core/plugins/downloaders/torrent/configuration.py b/core/plugins/downloaders/torrent/configuration.py index 9344ba7f..ada32ee8 100644 --- a/core/plugins/downloaders/torrent/configuration.py +++ b/core/plugins/downloaders/torrent/configuration.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import core from core.plugins.downloaders.torrent.utils import create_torrent_class diff --git a/core/plugins/downloaders/torrent/deluge.py b/core/plugins/downloaders/torrent/deluge.py index 0c4c07c8..7a3cc415 100644 --- a/core/plugins/downloaders/torrent/deluge.py +++ b/core/plugins/downloaders/torrent/deluge.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from deluge_client.client import DelugeRPCClient import core diff --git a/core/plugins/downloaders/torrent/qbittorrent.py b/core/plugins/downloaders/torrent/qbittorrent.py index 0532b9a7..d42ea86a 100644 --- a/core/plugins/downloaders/torrent/qbittorrent.py +++ b/core/plugins/downloaders/torrent/qbittorrent.py @@ -1,11 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - - from qbittorrent import Client as qBittorrentClient import core diff --git a/core/plugins/downloaders/torrent/synology.py b/core/plugins/downloaders/torrent/synology.py index 68860629..b23aa33f 100644 --- a/core/plugins/downloaders/torrent/synology.py +++ b/core/plugins/downloaders/torrent/synology.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from syno.downloadstation import DownloadStation import core diff --git a/core/plugins/downloaders/torrent/transmission.py b/core/plugins/downloaders/torrent/transmission.py index 8c58eae2..d122aaf0 100644 --- a/core/plugins/downloaders/torrent/transmission.py +++ b/core/plugins/downloaders/torrent/transmission.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from transmissionrpc.client import Client as TransmissionClient import core diff --git a/core/plugins/downloaders/torrent/utils.py b/core/plugins/downloaders/torrent/utils.py index f1a3cba1..9fc9fd40 100644 --- a/core/plugins/downloaders/torrent/utils.py +++ b/core/plugins/downloaders/torrent/utils.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import time import core diff --git a/core/plugins/downloaders/torrent/utorrent.py b/core/plugins/downloaders/torrent/utorrent.py index e591c46b..95422bfe 100644 --- a/core/plugins/downloaders/torrent/utorrent.py +++ b/core/plugins/downloaders/torrent/utorrent.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from utorrent.client import UTorrentClient import core diff --git a/core/plugins/plex.py b/core/plugins/plex.py index 5c3f0e8b..6d851e85 100644 --- a/core/plugins/plex.py +++ b/core/plugins/plex.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests import core diff --git a/core/plugins/subtitles.py b/core/plugins/subtitles.py index 9c236aa1..4acffa61 100644 --- a/core/plugins/subtitles.py +++ b/core/plugins/subtitles.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from babelfish import Language import subliminal diff --git a/core/scene_exceptions.py b/core/scene_exceptions.py index f00eccd3..5d748d09 100644 --- a/core/scene_exceptions.py +++ b/core/scene_exceptions.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import platform import re diff --git a/core/transcoder.py b/core/transcoder.py index 394f4ec1..69b3821f 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import errno import json import sys diff --git a/core/user_scripts.py b/core/user_scripts.py index eaeb1b0f..b749a2a9 100644 --- a/core/user_scripts.py +++ b/core/user_scripts.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os from subprocess import Popen @@ -19,7 +10,6 @@ from core.auto_process.common import ( ) - def external_script(output_destination, torrent_name, torrent_label, settings): final_result = 0 # start at 0. num_files = 0 diff --git a/core/utils/__init__.py b/core/utils/__init__.py index 202e7d19..136cd5e0 100644 --- a/core/utils/__init__.py +++ b/core/utils/__init__.py @@ -1,12 +1,3 @@ -# coding=utf-8 - -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests from core.utils import shutil_custom diff --git a/core/utils/common.py b/core/utils/common.py index 2174644c..9b21936c 100644 --- a/core/utils/common.py +++ b/core/utils/common.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os.path from six import text_type diff --git a/core/utils/download_info.py b/core/utils/download_info.py index 2e30d35c..ce6e6717 100644 --- a/core/utils/download_info.py +++ b/core/utils/download_info.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import datetime from six import text_type diff --git a/core/utils/encoding.py b/core/utils/encoding.py index e4ad894a..cca5306f 100644 --- a/core/utils/encoding.py +++ b/core/utils/encoding.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os from six import text_type diff --git a/core/utils/files.py b/core/utils/files.py index f29efa6b..57144304 100644 --- a/core/utils/files.py +++ b/core/utils/files.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import re import shutil diff --git a/core/utils/identification.py b/core/utils/identification.py index 2b43daec..2dc00250 100644 --- a/core/utils/identification.py +++ b/core/utils/identification.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import re diff --git a/core/utils/links.py b/core/utils/links.py index 1daa2441..ab558e9b 100644 --- a/core/utils/links.py +++ b/core/utils/links.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import shutil diff --git a/core/utils/naming.py b/core/utils/naming.py index dfabec3f..ba014312 100644 --- a/core/utils/naming.py +++ b/core/utils/naming.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import re diff --git a/core/utils/network.py b/core/utils/network.py index bfb54381..5a7a5758 100644 --- a/core/utils/network.py +++ b/core/utils/network.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import socket import struct import time diff --git a/core/utils/parsers.py b/core/utils/parsers.py index 12303a3d..7577be62 100644 --- a/core/utils/parsers.py +++ b/core/utils/parsers.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import core diff --git a/core/utils/paths.py b/core/utils/paths.py index ee0a48db..0afc3035 100644 --- a/core/utils/paths.py +++ b/core/utils/paths.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - from functools import partial import os import re diff --git a/core/utils/processes.py b/core/utils/processes.py index 56882757..5918aa8b 100644 --- a/core/utils/processes.py +++ b/core/utils/processes.py @@ -1,9 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) import os import socket @@ -19,7 +13,7 @@ if os.name == 'nt': from winerror import ERROR_ALREADY_EXISTS -class WindowsProcess(object): +class WindowsProcess: def __init__(self): self.mutex = None self.mutexname = 'nzbtomedia_{pid}'.format(pid=core.PID_FILE.replace('\\', '/')) # {D0E858DF-985E-4907-B7FB-8D732C3FC3B9}' @@ -42,7 +36,7 @@ class WindowsProcess(object): self.CloseHandle(self.mutex) -class PosixProcess(object): +class PosixProcess: def __init__(self): self.pidpath = core.PID_FILE self.lock_socket = None diff --git a/core/version_check.py b/core/version_check.py index a6dde88d..a70fb4f0 100644 --- a/core/version_check.py +++ b/core/version_check.py @@ -1,14 +1,6 @@ -# coding=utf-8 # Author: Nic Wolfe # Modified by: echel0n -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import platform import re @@ -25,7 +17,7 @@ import core from core import github_api as github, logger -class CheckVersion(object): +class CheckVersion: """Version checker that runs in a thread with the SB scheduler.""" def __init__(self): @@ -88,7 +80,7 @@ class CheckVersion(object): return result -class UpdateManager(object): +class UpdateManager: def get_github_repo_user(self): return core.GIT_USER diff --git a/eol.py b/eol.py index de9b9502..0bbeea38 100644 --- a/eol.py +++ b/eol.py @@ -1,12 +1,5 @@ #!/usr/bin/env python -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import datetime import sys import warnings