diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 37c175b2cbf79bf29df084177ba93ecdcd6b517a..f8021c6e36d5d3d758dc24258e86cb6dd1ec35ab 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import webbrowser import datetime @@ -37,10 +36,7 @@ from github import Github from sickbeard import metadata from sickbeard import providers from sickbeard.providers.generic import GenericProvider -from sickbeard.providers import btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, torrentz, \ - omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, nextgen, speedcd, nyaatorrents, animenzb, bluetigers, cpasbien, fnt, xthor, torrentbytes, \ - frenchtorrentdb, freshontv, titansoftv, libertalia, morethantv, bitsoup, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, extratorrent, \ - scenetime, btdigg, strike, transmitthenet, tvchaosuk, bitcannon, pretome, gftracker, hdspace + from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, \ naming_ep_type from sickbeard import searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser, \ diff --git a/sickbeard/dailysearcher.py b/sickbeard/dailysearcher.py index 2e0f11b41e7bfaa2a59794d89a5c0da98e1ea391..02c7950d079f4a1b9e9e87bae6dd3efdbadcad4f 100644 --- a/sickbeard/dailysearcher.py +++ b/sickbeard/dailysearcher.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import datetime import threading diff --git a/sickbeard/db.py b/sickbeard/db.py index eb81bd2dfcf5e2052475033fc9b9ae8f3257e7fa..1b03819a7755c00423c29f84ac934a24f99b74ca 100644 --- a/sickbeard/db.py +++ b/sickbeard/db.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os.path import re diff --git a/sickbeard/failedProcessor.py b/sickbeard/failedProcessor.py index 2d58cb23f83835e306b272efc55e1a399edffe4b..3846654848559ff5f14005d2f00d6b0946593331 100644 --- a/sickbeard/failedProcessor.py +++ b/sickbeard/failedProcessor.py @@ -16,7 +16,6 @@ # # You should have received a copy of the GNU General Public License -from __future__ import with_statement import sickbeard from sickbeard import logger diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index 184cd49c48da728d933239154f1a40f4c08bdcb0..e994d71710cd8460794eb4dba915c02434dd3a69 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os import ctypes diff --git a/sickbeard/logger.py b/sickbeard/logger.py index 985739a47fa46e10f5c226b56bc0e8f801c609af..5bfa36189672bd88296f386352a4afd5bf0ca16b 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -18,7 +18,6 @@ # along with SickRage. If not, see <http://www.gnu.org/licenses/>. # pylint: disable=W0703 -from __future__ import with_statement import os import re import sys diff --git a/sickbeard/metadata/generic.py b/sickbeard/metadata/generic.py index 8261c5d1a72df710d019f869d9ca533a955a48e8..fe060a7d88ea155fea959f9c7b9f008ba32545b7 100644 --- a/sickbeard/metadata/generic.py +++ b/sickbeard/metadata/generic.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os.path import re diff --git a/sickbeard/metadata/tivo.py b/sickbeard/metadata/tivo.py index 7ebcb24053506ea940f0d125ba05f6006202f537..383a77a2d3aba1407618f5af28c610bc23c6abef 100644 --- a/sickbeard/metadata/tivo.py +++ b/sickbeard/metadata/tivo.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import datetime import os diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py index 1e5dc48c67ca73fd6bf704f000a2cc6c7810c5de..2e77fe3756ee3d4ef3dba43f4b41934f704dfaf9 100644 --- a/sickbeard/name_parser/parser.py +++ b/sickbeard/name_parser/parser.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os import time diff --git a/sickbeard/nzbSplitter.py b/sickbeard/nzbSplitter.py index dac69455df3864adbaad3b82e62ed9e599cf9cea..b9087c3894f4a7593aa307bb90017eb93f75e47a 100644 --- a/sickbeard/nzbSplitter.py +++ b/sickbeard/nzbSplitter.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import requests import re diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py index 7909ee2dd4fc3864b5889e16829f61bef2d18a7b..11c2e9cb92b6a24c9258a1003e39d64091e69d02 100644 --- a/sickbeard/postProcessor.py +++ b/sickbeard/postProcessor.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import glob import fnmatch diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py index b52bccea170e1a47d51c42a7e738883e8c8ed5a2..93832ae507ba9ad9ca1b9e4517b529511cc37c12 100644 --- a/sickbeard/processTV.py +++ b/sickbeard/processTV.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os import stat diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 96db187900287bead09950ee305e7c29ec86cfbe..09bea425e06b920121be80afe08f57f0b33e2153 100644 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -16,6 +16,11 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. +from sickbeard.providers import btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, torrentz, \ + omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, nextgen, speedcd, nyaatorrents, animenzb, bluetigers, cpasbien, fnt, xthor, torrentbytes, \ + frenchtorrentdb, freshontv, titansoftv, libertalia, morethantv, bitsoup, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, extratorrent, \ + scenetime, btdigg, strike, transmitthenet, tvchaosuk, bitcannon, pretome, gftracker, hdspace + __all__ = ['womble', 'btn', 'thepiratebay', diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 84c11a448e91694c846b57eb1cf231f26041de52..c93f2f9dd4c0b506709af12a2c2c55c1320a3ef4 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import datetime import os diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py index 62cf93059bff82e58167fc953375239f07a19eb8..b2140dfe9b41af242de28358067543b5a0212dc3 100644 --- a/sickbeard/providers/kat.py +++ b/sickbeard/providers/kat.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import traceback diff --git a/sickbeard/providers/thepiratebay.py b/sickbeard/providers/thepiratebay.py index 8586e2e0376c58709d1a0d49deaa9949b8f5ace5..6b90b5c5bc685c7e9dede136fecc050d14edf1e2 100644 --- a/sickbeard/providers/thepiratebay.py +++ b/sickbeard/providers/thepiratebay.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import re from urllib import urlencode diff --git a/sickbeard/rssfeeds.py b/sickbeard/rssfeeds.py index 4e5620367596ce4d0bbfefdfdc85246f9a8972b9..5fb71ca83941057d7bdbacfd4539d2033b89ff4c 100644 --- a/sickbeard/rssfeeds.py +++ b/sickbeard/rssfeeds.py @@ -1,4 +1,3 @@ -from __future__ import with_statement import os import urllib diff --git a/sickbeard/search.py b/sickbeard/search.py index a3e22878d5f3a5bb34c8f1f6d538b7da558a2b7f..1eba3b0b776fcbd0bd2ccd65eed7a2f6fd54c0fa 100644 --- a/sickbeard/search.py +++ b/sickbeard/search.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os import re diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py index 961c9e11e83a41260c74db04056764d30d26776f..b25ca0801b5400bafb6a130b44064adad3e3f0c3 100644 --- a/sickbeard/searchBacklog.py +++ b/sickbeard/searchBacklog.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import datetime import threading diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py index 6bd2006dd783519bbe71524815be4a5512cb947e..91a1cf1972c1b14dba95ea7a2a845feb525a1f62 100644 --- a/sickbeard/search_queue.py +++ b/sickbeard/search_queue.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import time import traceback diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py index c97d84710aee5d6b120b429c996e70e229aa5685..544cffa92147c86a1b875f6630aa621d436247b3 100644 --- a/sickbeard/show_queue.py +++ b/sickbeard/show_queue.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import traceback diff --git a/sickbeard/tv.py b/sickbeard/tv.py index bc2fceb6a5bda20e93bc8ea098455f07e1e0945a..14b45aa420752cf105f7fc6a5cb12f3b8357f678 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os.path import datetime diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py index fcfa20fea0eacc1707340e49f72399126e1b361c..1103353abaeeac7dbac9dbf34762c7f9ad1e9b00 100644 --- a/sickbeard/tvcache.py +++ b/sickbeard/tvcache.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import time import datetime diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index 87a796208440a4cc289adcbf3e7cbca56d0d03f8..8a0c68af6601b4ddd34be91291c7e465fe5df1cc 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with SickRage. If not, see <http://www.gnu.org/licenses/>. -from __future__ import with_statement import os import time