From 8535e6ade9928520433e6e2516a74fd7eb00fb78 Mon Sep 17 00:00:00 2001 From: Brian Sheldon Date: Sun, 27 Nov 2022 19:10:07 -0500 Subject: [PATCH] Python 2 support dropped - removed __future__ imports are default in Python 3 --- cleanup.py | 7 ------- core/__init__.py | 7 ------- core/auto_process/books.py | 7 ------- core/auto_process/comics.py | 7 ------- core/auto_process/common.py | 7 ------- core/auto_process/games.py | 7 ------- core/auto_process/managers/sickbeard.py | 7 ------- core/auto_process/movies.py | 7 ------- core/auto_process/music.py | 7 ------- core/auto_process/tv.py | 7 ------- core/configuration.py | 7 ------- core/databases.py | 7 ------- core/extractor/__init__.py | 7 ------- core/github_api.py | 7 ------- core/logger.py | 7 ------- core/main_db.py | 7 ------- core/plugins/downloaders/nzb/configuration.py | 7 ------- core/plugins/downloaders/nzb/utils.py | 7 ------- core/plugins/downloaders/torrent/configuration.py | 7 ------- core/plugins/downloaders/torrent/deluge.py | 7 ------- core/plugins/downloaders/torrent/qbittorrent.py | 8 -------- core/plugins/downloaders/torrent/synology.py | 7 ------- core/plugins/downloaders/torrent/transmission.py | 7 ------- core/plugins/downloaders/torrent/utils.py | 7 ------- core/plugins/downloaders/torrent/utorrent.py | 7 ------- core/plugins/plex.py | 7 ------- core/plugins/subtitles.py | 7 ------- core/scene_exceptions.py | 7 ------- core/transcoder.py | 7 ------- core/user_scripts.py | 7 ------- core/utils/__init__.py | 7 ------- core/utils/common.py | 7 ------- core/utils/download_info.py | 7 ------- core/utils/encoding.py | 7 ------- core/utils/files.py | 7 ------- core/utils/identification.py | 7 ------- core/utils/links.py | 7 ------- core/utils/naming.py | 7 ------- core/utils/network.py | 7 ------- core/utils/parsers.py | 7 ------- core/utils/paths.py | 7 ------- core/utils/processes.py | 6 ------ core/version_check.py | 7 ------- eol.py | 7 ------- 44 files changed, 308 deletions(-) diff --git a/cleanup.py b/cleanup.py index 34cddb34..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 diff --git a/core/__init__.py b/core/__init__.py index fc2e5860..a350ca09 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -1,12 +1,5 @@ # 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..1fc6fa3d 100644 --- a/core/auto_process/books.py +++ b/core/auto_process/books.py @@ -1,12 +1,5 @@ # 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..7e4890ba 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -1,12 +1,5 @@ # 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 6340ce1a..6ea5e24e 100644 --- a/core/auto_process/common.py +++ b/core/auto_process/common.py @@ -1,10 +1,3 @@ -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests from core import logger diff --git a/core/auto_process/games.py b/core/auto_process/games.py index 73907d25..410b82a3 100644 --- a/core/auto_process/games.py +++ b/core/auto_process/games.py @@ -1,12 +1,5 @@ # 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 a5a37427..94df1c19 100644 --- a/core/auto_process/managers/sickbeard.py +++ b/core/auto_process/managers/sickbeard.py @@ -1,12 +1,5 @@ # coding=utf-8 -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import copy import core diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index bfee550a..bc6ff3e7 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -1,12 +1,5 @@ # 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..8a09f135 100644 --- a/core/auto_process/music.py +++ b/core/auto_process/music.py @@ -1,12 +1,5 @@ # 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..8fc735a2 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -1,12 +1,5 @@ # 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..a936a8f8 100644 --- a/core/configuration.py +++ b/core/configuration.py @@ -1,12 +1,5 @@ # 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..0803b9fc 100644 --- a/core/databases.py +++ b/core/databases.py @@ -1,12 +1,5 @@ # 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..df0066b0 100644 --- a/core/extractor/__init__.py +++ b/core/extractor/__init__.py @@ -1,12 +1,5 @@ # 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 dca5c7d1..8d2af4bd 100644 --- a/core/github_api.py +++ b/core/github_api.py @@ -1,12 +1,5 @@ # coding=utf-8 -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import requests diff --git a/core/logger.py b/core/logger.py index 80e3fe34..c991f913 100644 --- a/core/logger.py +++ b/core/logger.py @@ -1,12 +1,5 @@ # coding=utf-8 -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import logging import os import sys diff --git a/core/main_db.py b/core/main_db.py index 4fc80389..3a55feaa 100644 --- a/core/main_db.py +++ b/core/main_db.py @@ -1,12 +1,5 @@ # coding=utf-8 -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import re import sqlite3 import time 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..0b70c52c 100644 --- a/core/scene_exceptions.py +++ b/core/scene_exceptions.py @@ -1,12 +1,5 @@ # 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..575671e1 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -1,12 +1,5 @@ # 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..a42e17ad 100644 --- a/core/user_scripts.py +++ b/core/user_scripts.py @@ -1,12 +1,5 @@ # coding=utf-8 -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os from subprocess import Popen diff --git a/core/utils/__init__.py b/core/utils/__init__.py index 202e7d19..470fe4fd 100644 --- a/core/utils/__init__.py +++ b/core/utils/__init__.py @@ -1,12 +1,5 @@ # 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 c7f9e131..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 diff --git a/core/version_check.py b/core/version_check.py index a606e291..aec94817 100644 --- a/core/version_check.py +++ b/core/version_check.py @@ -2,13 +2,6 @@ # Author: Nic Wolfe # Modified by: echel0n -from __future__ import ( - absolute_import, - division, - print_function, - unicode_literals, -) - import os import platform import re 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