Modify imports

cleanup.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from __future__ import annotations
 
 import os
+import shutil
 import subprocess
 import sys
-import shutil
 
 sys.dont_write_bytecode = True
 

core/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import itertools
 import locale
 import os

core/auto_process/books.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/auto_process/comics.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/auto_process/common.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import typing
 
 import requests

core/auto_process/games.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/auto_process/managers/pymedusa.py

@@ -1,12 +1,14 @@
+from __future__ import annotations
+
 import time
 
+import requests
+
 import core.utils.common
 from core import logger
 from core.auto_process.common import ProcessResult
 from core.auto_process.managers.sickbeard import SickBeard
 
-import requests
-
 
 class PyMedusa(SickBeard):
     """PyMedusa class."""

core/auto_process/managers/sickbeard.py

@@ -1,5 +1,11 @@
+from __future__ import annotations
+
 import copy
 
+import requests
+from oauthlib.oauth2 import LegacyApplicationClient
+from requests_oauthlib import OAuth2Session
+
 import core
 from core import logger
 from core.auto_process.common import (
@@ -7,12 +13,6 @@ from core.auto_process.common import (
 )
 from core.utils import remote_dir
 
-from oauthlib.oauth2 import LegacyApplicationClient
-
-import requests
-
-from requests_oauthlib import OAuth2Session
-
 
 class InitSickBeard:
     """SickBeard init class.

core/auto_process/movies.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/auto_process/music.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/auto_process/tv.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import errno
 import json
@@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient
 from requests_oauthlib import OAuth2Session
 
 import core
-from core import logger, transcoder
+from core import logger
-from core.auto_process.common import (
+from core import transcoder
-    ProcessResult,
+from core.auto_process.common import command_complete
-    command_complete,
+from core.auto_process.common import completed_download_handling
-    completed_download_handling,
+from core.auto_process.common import ProcessResult
-)
 from core.auto_process.managers.sickbeard import InitSickBeard
 from core.plugins.downloaders.nzb.utils import report_nzb
-from core.plugins.subtitles import import_subs, rename_subs
+from core.plugins.subtitles import import_subs
+from core.plugins.subtitles import rename_subs
 from core.scene_exceptions import process_all_exceptions
-from core.utils import (
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import find_download
-    find_download,
+from core.utils import find_imdbid
-    find_imdbid,
+from core.utils import flatten
-    flatten,
+from core.utils import list_media_files
-    list_media_files,
+from core.utils import remote_dir
-    remote_dir,
+from core.utils import remove_dir
-    remove_dir,
+from core.utils import server_responding
-    server_responding,
-)
 
 
 requests.packages.urllib3.disable_warnings()

core/configuration.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import os
 import shutil

core/databases.py

@@ -1,4 +1,7 @@
-from core import logger, main_db
+from __future__ import annotations
+
+from core import logger
+from core import main_db
 from core.utils import backup_versioned_file
 
 MIN_DB_VERSION = 1  # oldest db version we support migrating from

core/extractor/__init__.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
+
 import os
 import platform
 import shutil
 import stat
 import subprocess
-from subprocess import Popen, call
+from subprocess import call
+from subprocess import Popen
 from time import sleep
 
 import core

core/github_api.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import requests
 
 

core/logger.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
+import functools
 import logging
 import os
 import sys
 import threading
 
 import core
-import functools
 
 # number of log files to keep
 NUM_LOGS = 3

core/main_db.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 import sqlite3
 import time

core/plugins/downloaders/configuration.py

@@ -1,5 +1,5 @@
+from __future__ import annotations
+
 from core.plugins.downloaders.nzb.configuration import configure_nzbs
-from core.plugins.downloaders.torrent.configuration import (
+from core.plugins.downloaders.torrent.configuration import configure_torrent_class
-    configure_torrents,
+from core.plugins.downloaders.torrent.configuration import configure_torrents
-    configure_torrent_class,
-)

core/plugins/downloaders/nzb/configuration.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import core
 
 

core/plugins/downloaders/nzb/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import requests

core/plugins/downloaders/torrent/configuration.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import core
 from core.plugins.downloaders.torrent.utils import create_torrent_class
 

core/plugins/downloaders/torrent/deluge.py

@@ -1,4 +1,6 @@
-from deluge_client.client import DelugeRPCClient
+from __future__ import annotations
+
+from deluge_client import DelugeRPCClient
 
 import core
 from core import logger

core/plugins/downloaders/torrent/qbittorrent.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from qbittorrent import Client as qBittorrentClient
 
 import core

core/plugins/downloaders/torrent/synology.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from syno.downloadstation import DownloadStation
 
 import core

core/plugins/downloaders/torrent/transmission.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from transmissionrpc.client import Client as TransmissionClient
 
 import core

core/plugins/downloaders/torrent/utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 
 import core
@@ -5,9 +7,9 @@ from core import logger
 
 from .deluge import configure_client as deluge_client
 from .qbittorrent import configure_client as qbittorrent_client
+from .synology import configure_client as synology_client
 from .transmission import configure_client as transmission_client
 from .utorrent import configure_client as utorrent_client
-from .synology import configure_client as synology_client
 
 torrent_clients = {
     'deluge': deluge_client,

core/plugins/downloaders/torrent/utorrent.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from utorrent.client import UTorrentClient
 
 import core

core/plugins/downloaders/utils.py

@@ -1,5 +1,5 @@
-from core.plugins.downloaders.torrent.utils import (
+from __future__ import annotations
-    pause_torrent,
+
-    remove_torrent,
+from core.plugins.downloaders.torrent.utils import pause_torrent
-    resume_torrent,
+from core.plugins.downloaders.torrent.utils import remove_torrent
-)
+from core.plugins.downloaders.torrent.utils import resume_torrent

core/plugins/plex.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import requests
 
 import core

core/plugins/subtitles.py

@@ -1,12 +1,14 @@
-from babelfish import Language
+from __future__ import annotations
-import subliminal
-
-import core
-from core import logger
 
 import os
 import re
 
+import subliminal
+from babelfish import Language
+
+import core
+from core import logger
+
 for provider in subliminal.provider_manager.internal_extensions:
     if provider not in [str(x) for x in subliminal.provider_manager.list_entry_points()]:
         subliminal.provider_manager.register(str(provider))

core/processor/manual.py

@@ -1,13 +1,13 @@
+from __future__ import annotations
+
 import os
 
 import core
 from core import logger
 from core.auto_process.common import ProcessResult
 from core.processor import nzb
-from core.utils import (
+from core.utils import get_dirs
-    get_dirs,
+from core.utils import get_download_info
-    get_download_info,
-)
 
 
 def process():

core/processor/nzb.py

@@ -1,19 +1,25 @@
+from __future__ import annotations
+
 import datetime
 
 import core
-from core import logger, main_db
+from core import logger
-from core.auto_process import comics, games, movies, music, tv, books
+from core import main_db
+from core.auto_process import books
+from core.auto_process import comics
+from core.auto_process import games
+from core.auto_process import movies
+from core.auto_process import music
+from core.auto_process import tv
 from core.auto_process.common import ProcessResult
 from core.plugins.downloaders.nzb.utils import get_nzoid
 from core.plugins.plex import plex_update
 from core.user_scripts import external_script
-from core.utils import (
+from core.utils import char_replace
-    char_replace,
+from core.utils import clean_dir
-    clean_dir,
+from core.utils import convert_to_ascii
-    convert_to_ascii,
+from core.utils import extract_files
-    extract_files,
+from core.utils import update_download_info_status
-    update_download_info_status,
-)
 
 
 def process(input_directory, input_name=None, status=0, client_agent='manual', download_id=None, input_category=None, failure_link=None):

core/processor/nzbget.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 

core/processor/sab.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 from core import logger

core/scene_exceptions.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import platform
 import re

core/transcoder.py

@@ -1,12 +1,14 @@
+from __future__ import annotations
+
 import errno
 import json
-import sys
 import os
-import time
 import platform
 import re
 import shutil
 import subprocess
+import sys
+import time
 
 from babelfish import Language
 

core/user_scripts.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from subprocess import Popen
 

core/utils/__init__.py

@@ -1,43 +1,53 @@
+from __future__ import annotations
+
 import requests
 
-from core.utils.common import clean_dir, flatten, get_dirs, process_dir
+from core.utils.common import clean_dir
-from core.utils.download_info import get_download_info, update_download_info_status
+from core.utils.common import flatten
-from core.utils.encoding import char_replace, convert_to_ascii
+from core.utils.common import get_dirs
-from core.utils.files import (
+from core.utils.common import process_dir
-    backup_versioned_file,
+from core.utils.download_info import get_download_info
-    extract_files,
+from core.utils.download_info import update_download_info_status
-    is_archive_file,
+from core.utils.encoding import char_replace
-    is_media_file,
+from core.utils.encoding import convert_to_ascii
-    is_min_size,
+from core.utils.files import backup_versioned_file
-    list_media_files,
+from core.utils.files import extract_files
-    move_file,
+from core.utils.files import is_archive_file
-)
+from core.utils.files import is_media_file
-from core.utils.identification import category_search, find_imdbid
+from core.utils.files import is_min_size
-from core.utils.links import copy_link, replace_links
+from core.utils.files import list_media_files
-from core.utils.naming import clean_file_name, is_sample, sanitize_name
+from core.utils.files import move_file
-from core.utils.network import find_download, server_responding, test_connection, wake_on_lan, wake_up
+from core.utils.identification import category_search
-from core.utils.parsers import (
+from core.utils.identification import find_imdbid
-    parse_args,
+from core.utils.links import copy_link
-    parse_deluge,
+from core.utils.links import replace_links
-    parse_other,
+from core.utils.naming import clean_file_name
-    parse_qbittorrent,
+from core.utils.naming import is_sample
-    parse_rtorrent,
+from core.utils.naming import sanitize_name
-    parse_transmission,
+from core.utils.network import find_download
-    parse_utorrent,
+from core.utils.network import server_responding
-    parse_vuze,
+from core.utils.network import test_connection
-)
+from core.utils.network import wake_on_lan
-from core.utils.paths import (
+from core.utils.network import wake_up
-    clean_directory,
+from core.utils.parsers import parse_args
-    flatten_dir,
+from core.utils.parsers import parse_deluge
-    get_dir_size,
+from core.utils.parsers import parse_other
-    make_dir,
+from core.utils.parsers import parse_qbittorrent
-    onerror,
+from core.utils.parsers import parse_rtorrent
-    rchmod,
+from core.utils.parsers import parse_transmission
-    remote_dir,
+from core.utils.parsers import parse_utorrent
-    remove_dir,
+from core.utils.parsers import parse_vuze
-    remove_empty_folders,
+from core.utils.paths import clean_directory
-    remove_read_only,
+from core.utils.paths import flatten_dir
-)
+from core.utils.paths import get_dir_size
-from core.utils.processes import RunningProcess, restart
+from core.utils.paths import make_dir
+from core.utils.paths import onerror
+from core.utils.paths import rchmod
+from core.utils.paths import remote_dir
+from core.utils.paths import remove_dir
+from core.utils.paths import remove_empty_folders
+from core.utils.paths import remove_read_only
+from core.utils.processes import restart
+from core.utils.processes import RunningProcess
 
 requests.packages.urllib3.disable_warnings()

core/utils/common.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
 import os.path
 import typing
 import urllib.parse
 
 import core
 from core import logger
-from core.utils.files import list_media_files, move_file
+from core.utils.files import list_media_files
-from core.utils.paths import clean_directory, flatten_dir
+from core.utils.files import move_file
+from core.utils.paths import clean_directory
+from core.utils.paths import flatten_dir
 
 
 def flatten(output_destination):
@@ -116,7 +120,7 @@ def get_dirs(section, subsection, link='hard'):
 def create_url(
     scheme: str,
     host: str,
-    port: typing.Optional[int] = None,
+    port: int | None = None,
     path: str = '',
     query: str = '',
 ) -> str:

core/utils/download_info.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import datetime
 
-from core import logger, main_db
+from core import logger
+from core import main_db
 
 database = main_db.DBConnection()
 

core/utils/encoding.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import core

core/utils/files.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import re
 import shutil
@@ -8,10 +10,13 @@ import beets.mediafile
 import guessit
 
 import core
-from core import extractor, logger
+from core import extractor
+from core import logger
 from core.utils.links import copy_link
-from core.utils.naming import is_sample, sanitize_name
+from core.utils.naming import is_sample
-from core.utils.paths import get_dir_size, make_dir
+from core.utils.naming import sanitize_name
+from core.utils.paths import get_dir_size
+from core.utils.paths import make_dir
 
 
 def move_file(mediafile, path, link):

core/utils/identification.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import re
 

core/utils/links.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import shutil
 

core/utils/naming.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 
 

core/utils/network.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import socket
 import struct
 import time

core/utils/parsers.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import core

core/utils/paths.py

@@ -1,8 +1,10 @@
-from functools import partial
+from __future__ import annotations
+
 import os
 import re
 import shutil
 import stat
+from functools import partial
 
 import core
 from core import logger

core/utils/processes.py

@@ -1,10 +1,15 @@
+from __future__ import annotations
+
 import os
 import socket
 import subprocess
 import sys
 
 import core
-from core import logger, version_check, APP_FILENAME, SYS_ARGV
+from core import APP_FILENAME
+from core import logger
+from core import SYS_ARGV
+from core import version_check
 
 if os.name == 'nt':
     from win32event import CreateMutex

core/version_check.py

@@ -1,5 +1,6 @@
 # Author: Nic Wolfe <nic@wolfeden.ca>
 # Modified by: echel0n
+from __future__ import annotations
 
 import os
 import platform
@@ -9,12 +10,12 @@ import stat
 import subprocess
 import tarfile
 import traceback
-
 from urllib.request import urlretrieve
 
 import cleanup
 import core
-from core import github_api as github, logger
+from core import github_api as github
+from core import logger
 
 
 class CheckVersion:

eol.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import annotations
 
 import datetime
 import sys

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import annotations
 
 import io
 import os.path

tests/__init__.py

@@ -1 +1,2 @@
+from __future__ import annotations
 __author__ = 'Justin'

tests/test_initialize.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+from __future__ import annotations
 
 import core
 

tests/test_transcoder.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+from __future__ import annotations
 
 import core
 from core import transcoder