Merge pull request #1922 from clinton-hall/farewell-2.7

Drop legacy Python 2.7 constructs

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

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

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

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

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

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
 

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

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

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

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

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

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
 

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

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'):

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

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
 

core/plugins/downloaders/nzb/configuration.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import core
 
 

core/plugins/downloaders/nzb/utils.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import os
 
 import requests

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
 

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

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

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

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

core/plugins/downloaders/torrent/utils.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import time
 
 import core

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

core/plugins/plex.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import requests
 
 import core

core/plugins/subtitles.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 from babelfish import Language
 import subliminal
 

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

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

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

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

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

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

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

core/utils/files.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import os
 import re
 import shutil

core/utils/identification.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import os
 import re
 

core/utils/links.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import os
 import shutil
 

core/utils/naming.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import re
 
 

core/utils/network.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import socket
 import struct
 import time

core/utils/parsers.py

@@ -1,10 +1,3 @@
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import os
 
 import core

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

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

core/version_check.py

@@ -1,14 +1,6 @@
-# coding=utf-8
 # Author: Nic Wolfe <nic@wolfeden.ca>
 # 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
 

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