diff --git a/setup.cfg b/setup.cfg
index 8bdc41615f7ed72f48766b3dbac95835a09a080a..377b842821fe3149e47e440a551e4b08570a8492 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,8 +4,11 @@ combine_as_imports = true
order_by_type = false
add_imports = from __future__ import unicode_literals
known_first_party = sickbeard, sickrage
-# Fixes sections for vendored packages, when lib/ is (first) in $PATH
-# default_section = THIRDPARTY
+not_skip = __init__.py
+# We skip this file because the pytz needs to be before sickbeard.subtitles
+skip_glob = */sickbeard/__init__.py
+# Fixes sections for vendored packages, when lib/ is first in $PATH
+default_section = THIRDPARTY
[extract_messages]
width = 80
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 171f68f8e0a51fce5edf29148856ed0ae49c7c46..20375abf62fc2cd33a21455ffc162e287c66a84a 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -31,6 +31,9 @@ import sys
from threading import Lock
import rarfile
+import requests
+from configobj import ConfigObj
+from tornado.locale import load_gettext_translations
try:
import pytz # pylint: disable=unused-import
@@ -40,33 +43,22 @@ except ImportError:
require('pytz')
+from sickbeard import (auto_postprocessor, dailysearcher, db, helpers, logger, metadata, naming, post_processing_queue, properFinder, providers, scheduler,
+ search_queue, searchBacklog, show_queue, showUpdater, subtitles, traktChecker, versionChecker)
+from sickbeard.common import ARCHIVED, IGNORED, MULTI_EP_STRINGS, SD, SKIPPED, WANTED
+from sickbeard.config import check_section, check_setting_bool, check_setting_float, check_setting_int, check_setting_str, ConfigMigrator
+from sickbeard.databases import cache_db, failed_db, mainDB
from sickbeard.indexers import indexer_api
-from sickbeard.common import SD, SKIPPED, ARCHIVED, IGNORED, WANTED, MULTI_EP_STRINGS
-from sickbeard.databases import mainDB, cache_db, failed_db
+from sickbeard.indexers.indexer_exceptions import (indexer_attributenotfound, indexer_episodenotfound, indexer_error, indexer_exception, indexer_seasonnotfound,
+ indexer_showincomplete, indexer_shownotfound, indexer_userabort)
from sickbeard.providers.newznab import NewznabProvider
from sickbeard.providers.rsstorrent import TorrentRssProvider
-from sickbeard.config import check_section, check_setting_int, check_setting_str, \
- check_setting_float, check_setting_bool, ConfigMigrator
-from sickbeard import db, helpers, scheduler, search_queue, show_queue, logger, \
- naming, dailysearcher, metadata, providers
-from sickbeard import searchBacklog, showUpdater, versionChecker, properFinder, \
- auto_postprocessor, post_processing_queue, subtitles, traktChecker
-from sickbeard.indexers.indexer_exceptions import indexer_shownotfound, \
- indexer_showincomplete, indexer_exception, indexer_error, \
- indexer_episodenotfound, indexer_attributenotfound, indexer_seasonnotfound, \
- indexer_userabort
-
from sickrage.helper import setup_github
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
from sickrage.providers.GenericProvider import GenericProvider
from sickrage.system.Shutdown import Shutdown
-from configobj import ConfigObj
-
-import requests
-
-from tornado.locale import load_gettext_translations
gettext.install('messages', unicode=1, codeset='UTF-8', names=["ngettext"])
diff --git a/sickbeard/blackandwhitelist.py b/sickbeard/blackandwhitelist.py
index 1f3e0bebbc1f490e151be566f2d45afb14486875..6660b232111cf5d60ee6d883f089bd6536204075 100644
--- a/sickbeard/blackandwhitelist.py
+++ b/sickbeard/blackandwhitelist.py
@@ -20,8 +20,9 @@
from __future__ import print_function, unicode_literals
-import sickbeard
from adba.aniDBerrors import AniDBCommandTimeoutError
+
+import sickbeard
from sickbeard import db, helpers, logger
diff --git a/sickbeard/browser.py b/sickbeard/browser.py
index 7e722b5819dcbd21a2b972282de5c350a05baa2d..52279afefeb72d18e094e128dbf6af9fef37d2d6 100644
--- a/sickbeard/browser.py
+++ b/sickbeard/browser.py
@@ -24,8 +24,9 @@ import os
import string
from operator import itemgetter
-import sickbeard
import six
+
+import sickbeard
from sickbeard import logger
from sickrage.helper.encoding import ek
diff --git a/sickbeard/classes.py b/sickbeard/classes.py
index c4d11ba96a20c2c6db65e878804c8b5284b516d6..426098a5163ec2ba06d6bf2e061ae59b1e56eed7 100644
--- a/sickbeard/classes.py
+++ b/sickbeard/classes.py
@@ -23,10 +23,11 @@ from __future__ import print_function, unicode_literals
import datetime
import sys
+from six.moves import urllib
+
import sickbeard
from sickbeard.common import Quality, USER_AGENT
from sickrage.helper.common import dateTimeFormat
-from six.moves import urllib
class SickBeardURLopener(urllib.request.FancyURLopener, object):
diff --git a/sickbeard/clients/deluged_client.py b/sickbeard/clients/deluged_client.py
index 228329b20f3b3c15f7a368f3d684aa0677ecfea3..1f6703e44bb6bf1ca1ca1bf450196fe775cf7069 100644
--- a/sickbeard/clients/deluged_client.py
+++ b/sickbeard/clients/deluged_client.py
@@ -9,10 +9,11 @@ from __future__ import print_function, unicode_literals
from base64 import b64encode
+from synchronousdeluge import DelugeClient
+
import sickbeard
from sickbeard import logger
from sickbeard.clients.generic import GenericClient
-from synchronousdeluge import DelugeClient
class DelugeDAPI(GenericClient):
diff --git a/sickbeard/clients/download_station_client.py b/sickbeard/clients/download_station_client.py
index 8e72417c456f244611090b560b36e08e00cd38da..f5d7d6a42b35b3d805002fa55dea2f23e84df2b1 100644
--- a/sickbeard/clients/download_station_client.py
+++ b/sickbeard/clients/download_station_client.py
@@ -23,9 +23,10 @@ from __future__ import unicode_literals
import os
import re
-import sickbeard
import six
from requests.compat import urljoin
+
+import sickbeard
from sickbeard import logger
from sickbeard.clients.generic import GenericClient
diff --git a/sickbeard/clients/generic.py b/sickbeard/clients/generic.py
index a732ff221f268afc37744d24a15f86cc4af06093..6a91efdc49245de172277a3bae3347653e91a570 100644
--- a/sickbeard/clients/generic.py
+++ b/sickbeard/clients/generic.py
@@ -25,10 +25,11 @@ from base64 import b16encode, b32decode
from hashlib import sha1
import bencode
-import sickbeard
import six
from requests.compat import urlencode
from requests.models import HTTPError
+
+import sickbeard
from sickbeard import helpers, logger
diff --git a/sickbeard/clients/putio_client.py b/sickbeard/clients/putio_client.py
index 23b07a17c602b9cf2cbb77365e869521268ac027..9b1837ccda0b1297e4033171befec086d37809e0 100644
--- a/sickbeard/clients/putio_client.py
+++ b/sickbeard/clients/putio_client.py
@@ -20,6 +20,7 @@
from __future__ import unicode_literals
from putiopy import Client as PutioClient, ClientError
+
from sickbeard import helpers
from sickbeard.clients.generic import GenericClient
diff --git a/sickbeard/clients/qbittorrent_client.py b/sickbeard/clients/qbittorrent_client.py
index ed3ace0bd97fb125ea113202c19ad2f7889f77f2..23931c26c752a5f4f622104a171f2f51b9b4970c 100644
--- a/sickbeard/clients/qbittorrent_client.py
+++ b/sickbeard/clients/qbittorrent_client.py
@@ -22,9 +22,10 @@ from __future__ import unicode_literals
from time import sleep
-import sickbeard
from requests.auth import HTTPDigestAuth
from requests.compat import urljoin
+
+import sickbeard
from sickbeard.clients.generic import GenericClient
diff --git a/sickbeard/clients/rtorrent_client.py b/sickbeard/clients/rtorrent_client.py
index 28d96960d85d92de92540521a5a94490825602cd..2856c5eb80dccb253efe2795e88f03b9113e8e9c 100644
--- a/sickbeard/clients/rtorrent_client.py
+++ b/sickbeard/clients/rtorrent_client.py
@@ -26,8 +26,9 @@
from __future__ import print_function, unicode_literals
-import sickbeard
from rtorrent import RTorrent # pylint: disable=import-error
+
+import sickbeard
from sickbeard import ex, logger
from sickbeard.clients.generic import GenericClient
diff --git a/sickbeard/clients/utorrent_client.py b/sickbeard/clients/utorrent_client.py
index f3a8a595d7a7cb11054be2e12ff0c267528e6a6d..2e039fb5be27709593ba328014b6033f35a09d1c 100644
--- a/sickbeard/clients/utorrent_client.py
+++ b/sickbeard/clients/utorrent_client.py
@@ -22,9 +22,10 @@ from __future__ import unicode_literals
import re
from collections import OrderedDict
-import sickbeard
import six
from requests.compat import urljoin
+
+import sickbeard
from sickbeard.clients.generic import GenericClient
diff --git a/sickbeard/common.py b/sickbeard/common.py
index 3cdc99d4ec7648dd97f85927fa9b6f5663315954..b113ddd9f491d1b3786a2bb25d3fc72331a0e735 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -33,13 +33,14 @@ import uuid
from os import path
from fake_useragent import settings as UA_SETTINGS, UserAgent
+# noinspection PyUnresolvedReferences
+from six.moves import reduce
+
from sickbeard.numdict import NumDict
from sickrage.helper import video_screen_size
from sickrage.helper.encoding import ek
from sickrage.recompiled import tags
from sickrage.tagger.episode import EpisodeTags
-# noinspection PyUnresolvedReferences
-from six.moves import reduce
gettext.install('messages', unicode=1, codeset='UTF-8', names=["ngettext"])
diff --git a/sickbeard/config.py b/sickbeard/config.py
index 1cefe81546514a451bfff35f96da06b6ea66842e..d3327687c8b96c1e31f19920e3b05f8a3f75fa72 100644
--- a/sickbeard/config.py
+++ b/sickbeard/config.py
@@ -26,13 +26,14 @@ import platform
import re
import rarfile
-import sickbeard
import six
+# noinspection PyUnresolvedReferences
+from six.moves.urllib import parse
+
+import sickbeard
from sickbeard import db, helpers, logger, naming
from sickrage.helper.common import try_int
from sickrage.helper.encoding import ek
-# noinspection PyUnresolvedReferences
-from six.moves.urllib import parse
# Address poor support for scgi over unix domain sockets
# this is not nicely handled by python currently
diff --git a/sickbeard/databases/__init__.py b/sickbeard/databases/__init__.py
index b7883fae63d99a9e0b1e7dc24c57e9fb62488c09..d134bfeede1e35a0d43943eaea37bcd378ecd867 100644
--- a/sickbeard/databases/__init__.py
+++ b/sickbeard/databases/__init__.py
@@ -1,5 +1,4 @@
# coding=utf-8
-
# Author: Nic Wolfe <nic@wolfeden.ca>
# URL: https://sickrage.github.io
#
@@ -17,5 +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 unicode_literals
__all__ = ["mainDB", "cache", "failed"]
diff --git a/sickbeard/databases/mainDB.py b/sickbeard/databases/mainDB.py
index fe8a8908da922f5d658d9a318ece62a9977ceadf..bb588f73b2d5dfef2cfe4894894bb0bdfee07934 100644
--- a/sickbeard/databases/mainDB.py
+++ b/sickbeard/databases/mainDB.py
@@ -25,8 +25,9 @@ import datetime
import os.path
import warnings
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, db, helpers, logger, subtitles
from sickbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
from sickrage.helper.common import dateTimeFormat, episode_num
diff --git a/sickbeard/db.py b/sickbeard/db.py
index dc7cbaaad51d3adc1a702bb41f9c557d03ec519f..2bf6ce3aff7eaf61ea1f3329d4f960cd5c0f19f0 100644
--- a/sickbeard/db.py
+++ b/sickbeard/db.py
@@ -28,8 +28,9 @@ import time
import warnings
from sqlite3 import OperationalError
-import sickbeard
import six
+
+import sickbeard
from sickbeard import logger
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/event_queue.py b/sickbeard/event_queue.py
index 4bbda4dfc65d8532b49d0a6cf7900530efde3190..38ab414a39e7ebfcea4c701fb94fb77d22431afc 100644
--- a/sickbeard/event_queue.py
+++ b/sickbeard/event_queue.py
@@ -5,9 +5,10 @@ from __future__ import print_function, unicode_literals
import threading
import traceback
+from six.moves.queue import Empty, Queue
+
from sickbeard import logger
from sickrage.helper.exceptions import ex
-from six.moves.queue import Empty, Queue
class Event(object):
diff --git a/sickbeard/failed_history.py b/sickbeard/failed_history.py
index 8c1a6a877d0902c1526780f0349de84e64d70dee..cff5f40b7fcc35314fd8d08b2c765b942b7a3837 100644
--- a/sickbeard/failed_history.py
+++ b/sickbeard/failed_history.py
@@ -23,12 +23,13 @@ from __future__ import print_function, unicode_literals
import datetime
import re
+from six.moves import urllib
+
from sickbeard import db, logger
from sickbeard.common import FAILED, Quality, WANTED
from sickrage.helper.encoding import ss
from sickrage.helper.exceptions import EpisodeNotFoundException, ex
from sickrage.show.History import History
-from six.moves import urllib
def prepareFailedName(release):
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index 07c52a39dc5a1f7b05a848bc756b92363c6b04a9..12b0c650a72a3adaa62b6b41e7749721b37c9ad9 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -50,21 +50,22 @@ import certifi
import cfscrape
import rarfile
import requests
-import sickbeard
import six
from cachecontrol import CacheControl
from requests.compat import urljoin
from requests.utils import urlparse
+# noinspection PyUnresolvedReferences
+from six.moves import urllib
+# noinspection PyProtectedMember
+from tornado._locale_data import LOCALE_NAMES
+
+import sickbeard
from sickbeard import classes, db, logger
from sickbeard.common import USER_AGENT
from sickrage.helper import episode_num, MEDIA_EXTENSIONS, pretty_file_size, SUBTITLE_EXTENSIONS
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
from sickrage.show.Show import Show
-# noinspection PyUnresolvedReferences
-from six.moves import urllib
-# noinspection PyProtectedMember
-from tornado._locale_data import LOCALE_NAMES
# Add some missing languages
LOCALE_NAMES.update({
diff --git a/sickbeard/history.py b/sickbeard/history.py
index f663cf708323b110ff0ef60cb7520c5f27634f96..3b6a0b6b1fa1d38ddced41b9f6698fabcf7f043b 100644
--- a/sickbeard/history.py
+++ b/sickbeard/history.py
@@ -23,6 +23,7 @@ from __future__ import unicode_literals
import datetime
import db
+
from sickbeard.common import FAILED, Quality, SNATCHED, SUBTITLED
from sickrage.helper.encoding import ss
from sickrage.show.History import History
diff --git a/sickbeard/image_cache.py b/sickbeard/image_cache.py
index 44c313b4506252b7cab6899845a0e8dc2c1545a8..2fc0986956d59e8268aed36986293be0e691b16e 100644
--- a/sickbeard/image_cache.py
+++ b/sickbeard/image_cache.py
@@ -22,10 +22,11 @@ from __future__ import print_function, unicode_literals
import os.path
-import sickbeard
from hachoir_core.log import log
from hachoir_metadata import extractMetadata
from hachoir_parser import createParser
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.metadata.generic import GenericMetadata
from sickrage.helper.encoding import ek
diff --git a/sickbeard/imdbPopular.py b/sickbeard/imdbPopular.py
index f146b462116a8e1adecbe87224feed4afe060f3a..684a01b7c9e11a87f3b8e7bcba9c62ecf563819c 100644
--- a/sickbeard/imdbPopular.py
+++ b/sickbeard/imdbPopular.py
@@ -7,8 +7,9 @@ import posixpath
import re
from datetime import date
-import sickbeard
from bs4 import BeautifulSoup
+
+import sickbeard
from sickbeard import helpers
from sickrage.helper.encoding import ek
diff --git a/sickbeard/indexers/__init__.py b/sickbeard/indexers/__init__.py
index 67e7e7ba29ebcc8bf2631537ea22004baec4d82c..efa50a6829b5f3f4bfab7b772d43331f4abe6f8f 100644
--- a/sickbeard/indexers/__init__.py
+++ b/sickbeard/indexers/__init__.py
@@ -18,5 +18,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 . import indexer_api
-from . import indexer_exceptions
+from __future__ import unicode_literals
+
+from . import indexer_api, indexer_exceptions
diff --git a/sickbeard/indexers/indexer_api.py b/sickbeard/indexers/indexer_api.py
index 0ade80c2133d7722cc5f59dd0ee48c85acf005cd..1596da251d87f96a0e010c171deb888013774593 100644
--- a/sickbeard/indexers/indexer_api.py
+++ b/sickbeard/indexers/indexer_api.py
@@ -22,8 +22,9 @@ from __future__ import unicode_literals
import os
-import sickbeard
from indexer_config import indexerConfig, initConfig
+
+import sickbeard
from sickrage.helper.common import try_int
from sickrage.helper.encoding import ek
diff --git a/sickbeard/indexers/indexer_config.py b/sickbeard/indexers/indexer_config.py
index 58bccd4754fe238c55beefcc02c48ce321ad9628..c0bccbadfe9a29e51113a5effe468757eacbf46a 100644
--- a/sickbeard/indexers/indexer_config.py
+++ b/sickbeard/indexers/indexer_config.py
@@ -2,9 +2,10 @@
from __future__ import unicode_literals
-from sickbeard import helpers
from tvdb_api.tvdb_api import Tvdb
+from sickbeard import helpers
+
initConfig = {
'valid_languages': [
"da", "fi", "nl", "de", "it", "es", "fr", "pl", "hu", "el", "tr",
diff --git a/sickbeard/logger.py b/sickbeard/logger.py
index f3ac40cbc69408463c5ffb76bc5cd5a05d74e018..9c483659e20a35deac0af713c45548ecbbaaab17 100644
--- a/sickbeard/logger.py
+++ b/sickbeard/logger.py
@@ -36,16 +36,17 @@ import threading
import traceback
from logging import NullHandler
-import sickbeard
import six
from github import InputFileContent
from github.GithubException import RateLimitExceededException, TwoFactorException
+# noinspection PyUnresolvedReferences
+from six.moves.urllib.parse import quote
+
+import sickbeard
from sickbeard import classes
from sickrage.helper.common import dateTimeFormat
from sickrage.helper.encoding import ek, ss
from sickrage.helper.exceptions import ex
-# noinspection PyUnresolvedReferences
-from six.moves.urllib.parse import quote
# pylint: disable=line-too-long
diff --git a/sickbeard/metadata/__init__.py b/sickbeard/metadata/__init__.py
index 20d49c5d54e86194d57bf8e883057d79e3e96f4e..9fccfb5ade5505f732331a001117a7284a07ce76 100644
--- a/sickbeard/metadata/__init__.py
+++ b/sickbeard/metadata/__init__.py
@@ -18,10 +18,13 @@
# 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 unicode_literals
+
import sys
-from sickbeard.metadata import kodi, kodi_12plus, mediabrowser, ps3, wdtv, tivo, mede8er, generic, helpers
-__all__ = ['generic', 'helpers', 'kodi', 'kodi_12plus', 'mediabrowser', 'ps3', 'wdtv', 'tivo', 'mede8er']
+from sickbeard.metadata import generic, helpers, kodi, kodi_12plus, mede8er, mediabrowser, ps3, tivo, wdtv
+
+__all__ = ['generic', 'helpers', 'kodi', 'kodi_12plus', 'mede8er', 'mediabrowser', 'ps3', 'tivo', 'wdtv']
def available_generators():
diff --git a/sickbeard/metadata/generic.py b/sickbeard/metadata/generic.py
index 5e385b161b011c6b91a2c8f404a891e1f2d2aabd..c73dd192f7d6dcdd3750e4627cfcb9d7450be94a 100644
--- a/sickbeard/metadata/generic.py
+++ b/sickbeard/metadata/generic.py
@@ -25,16 +25,17 @@ import os
import re
import fanart as fanart_module
-import sickbeard
import six
from fanart.core import Request as fanartRequest
+from tmdb_api.tmdb_api import TMDB
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.metadata import helpers as metadata_helpers
from sickbeard.show_name_helpers import allPossibleShowNames
from sickrage.helper.common import replace_extension, try_int
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
-from tmdb_api.tmdb_api import TMDB
try:
import xml.etree.cElementTree as etree
diff --git a/sickbeard/metadata/kodi_12plus.py b/sickbeard/metadata/kodi_12plus.py
index f0f985399c06972f5b44f720618538cdc2939709..72605837df6ab2afd4d9c45aa05f3e0439638719 100644
--- a/sickbeard/metadata/kodi_12plus.py
+++ b/sickbeard/metadata/kodi_12plus.py
@@ -22,9 +22,10 @@ from __future__ import print_function, unicode_literals
import datetime
import re
-import sickbeard
import six
from babelfish import Country
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.metadata import generic
from sickrage.helper.common import dateFormat
diff --git a/sickbeard/metadata/mede8er.py b/sickbeard/metadata/mede8er.py
index 379aea3d473bdae3de4a1d3203c4d8ebd45ccfd3..7d090164f68150584e46d4526fb03e98cfb9597e 100644
--- a/sickbeard/metadata/mede8er.py
+++ b/sickbeard/metadata/mede8er.py
@@ -24,8 +24,9 @@ import datetime
import io
import os
-import sickbeard
import six
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.metadata import mediabrowser
from sickrage.helper.common import dateFormat, replace_extension
diff --git a/sickbeard/metadata/mediabrowser.py b/sickbeard/metadata/mediabrowser.py
index 0f4108ca913bc037fab23e95a0d394fea9b8cb3d..8e92406f6f329b862b8e4e174de595c9e6026646 100644
--- a/sickbeard/metadata/mediabrowser.py
+++ b/sickbeard/metadata/mediabrowser.py
@@ -24,8 +24,9 @@ import datetime
import os
import re
-import sickbeard
import six
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.metadata import generic
from sickrage.helper.common import dateFormat, replace_extension
diff --git a/sickbeard/name_cache.py b/sickbeard/name_cache.py
index bef228eb1b4a6bb52215dd36e9dd4ff761794a01..259f3590294ae2749992a90f0662f2647296e9cb 100644
--- a/sickbeard/name_cache.py
+++ b/sickbeard/name_cache.py
@@ -21,8 +21,9 @@ from __future__ import unicode_literals
import threading
-import sickbeard
import six
+
+import sickbeard
from sickbeard import db
# from sickbeard import logger
diff --git a/sickbeard/name_parser/__init__.py b/sickbeard/name_parser/__init__.py
index 9bad5790a5799b96f2e164d825c0b1f8ec0c2dfb..705411070cacbd6a3b6b9b0b40029bd754e4b904 100644
--- a/sickbeard/name_parser/__init__.py
+++ b/sickbeard/name_parser/__init__.py
@@ -1 +1,2 @@
# coding=utf-8
+from __future__ import unicode_literals
diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py
index 4ba359c9038a22680a051635e5d8adaa4c23b314..37029f3096a1dc3a9dace1180d4db15c937c9512 100644
--- a/sickbeard/name_parser/parser.py
+++ b/sickbeard/name_parser/parser.py
@@ -27,8 +27,9 @@ from collections import OrderedDict
from threading import Lock
import dateutil
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, db, helpers, logger, scene_exceptions, scene_numbering
from sickbeard.name_parser import regexes
from sickrage.helper.common import remove_extension
diff --git a/sickbeard/network_timezones.py b/sickbeard/network_timezones.py
index e93cffb52b677484acd99769c7c35a465bab1648..129604611a69247589d52261efbb5fda5b81c6f0 100644
--- a/sickbeard/network_timezones.py
+++ b/sickbeard/network_timezones.py
@@ -25,6 +25,7 @@ import re
import six
from dateutil import tz
+
from sickbeard import db, helpers, logger
from sickrage.helper.common import try_int
diff --git a/sickbeard/notifiers/__init__.py b/sickbeard/notifiers/__init__.py
index f77e9f4bf67a930968613d533be671a93e8f4ebe..3a9cb84142d505d164e3a40f3d2d5823a1aa8546 100644
--- a/sickbeard/notifiers/__init__.py
+++ b/sickbeard/notifiers/__init__.py
@@ -21,11 +21,8 @@
from __future__ import print_function, unicode_literals
import sickbeard
-
-from sickbeard.notifiers import kodi, plex, emby, nmj, nmjv2, synoindex, \
- synologynotifier, pytivo, growl, prowl, libnotify, pushover, boxcar2, \
- nma, pushalot, pushbullet, freemobile, telegram, tweet, trakt, emailnotify, \
- slack, discord, join, twilio_notify
+from sickbeard.notifiers import (boxcar2, discord, emailnotify, emby, freemobile, growl, join, kodi, libnotify, nma, nmj, nmjv2, plex, prowl, pushalot,
+ pushbullet, pushover, pytivo, slack, synoindex, synologynotifier, telegram, trakt, tweet, twilio_notify)
# home theater / nas
kodi_notifier = kodi.Notifier()
diff --git a/sickbeard/notifiers/discord.py b/sickbeard/notifiers/discord.py
index 3a0dffed3d15d363a7a52a721ef2974d52c9d11c..f4cefd1fdccb37e318845693b1975b30263a2849 100644
--- a/sickbeard/notifiers/discord.py
+++ b/sickbeard/notifiers/discord.py
@@ -21,8 +21,9 @@ from __future__ import unicode_literals
import json
import requests
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/emby.py b/sickbeard/notifiers/emby.py
index 7a7e2294862deece897884a9991b5abca65b1539..bdff96bf39bf0ee9d474bb9f65f894c4bdefb13a 100644
--- a/sickbeard/notifiers/emby.py
+++ b/sickbeard/notifiers/emby.py
@@ -20,10 +20,11 @@
from __future__ import print_function, unicode_literals
+from six.moves import urllib
+
import sickbeard
from sickbeard import logger
from sickrage.helper.exceptions import ex
-from six.moves import urllib
try:
import json
diff --git a/sickbeard/notifiers/freemobile.py b/sickbeard/notifiers/freemobile.py
index 35d26c97b64bac3c3bdacc6f848b1a73448e7064..e5079a257dbefd2b00c43cad32ff954ce1d4a93f 100644
--- a/sickbeard/notifiers/freemobile.py
+++ b/sickbeard/notifiers/freemobile.py
@@ -22,12 +22,13 @@
from __future__ import print_function, unicode_literals
-import sickbeard
import six
+from six.moves import urllib
+
+import sickbeard
from sickbeard import logger
from sickbeard.common import (NOTIFY_DOWNLOAD, NOTIFY_GIT_UPDATE, NOTIFY_GIT_UPDATE_TEXT, NOTIFY_LOGIN, NOTIFY_LOGIN_TEXT, NOTIFY_SNATCH,
NOTIFY_SUBTITLE_DOWNLOAD, notifyStrings)
-from six.moves import urllib
class Notifier(object):
diff --git a/sickbeard/notifiers/growl.py b/sickbeard/notifiers/growl.py
index 2cd2f5950f7a99a2d02cdc2b07da1c19f59011a0..4d59b064592f46b712907d07006e44188d3ad41b 100644
--- a/sickbeard/notifiers/growl.py
+++ b/sickbeard/notifiers/growl.py
@@ -22,8 +22,9 @@ from __future__ import print_function, unicode_literals
import socket
-import sickbeard
from libgrowl import gntp
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/join.py b/sickbeard/notifiers/join.py
index a082762af175b964e912efddea06cec03b53601e..d72ca549067ab30532f40a9d2f68919d4db00d4f 100644
--- a/sickbeard/notifiers/join.py
+++ b/sickbeard/notifiers/join.py
@@ -19,11 +19,12 @@
from __future__ import unicode_literals
+from six.moves import urllib
+
import sickbeard
from sickbeard import logger
from sickbeard.common import (NOTIFY_DOWNLOAD, NOTIFY_GIT_UPDATE, NOTIFY_GIT_UPDATE_TEXT, NOTIFY_LOGIN, NOTIFY_LOGIN_TEXT, NOTIFY_SNATCH,
NOTIFY_SUBTITLE_DOWNLOAD, notifyStrings)
-from six.moves import urllib
class Notifier(object):
diff --git a/sickbeard/notifiers/kodi.py b/sickbeard/notifiers/kodi.py
index c6e5dd8e7b6d4b2c084c9dc742abe43180633185..2211992a976b9e8484aa81872dd1b3b1ba9674a4 100644
--- a/sickbeard/notifiers/kodi.py
+++ b/sickbeard/notifiers/kodi.py
@@ -24,12 +24,13 @@ import base64
import socket
import time
-import sickbeard
import six
+from six.moves import http_client, urllib
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.encoding import ss
from sickrage.helper.exceptions import ex
-from six.moves import http_client, urllib
try:
import xml.etree.cElementTree as etree
diff --git a/sickbeard/notifiers/nma.py b/sickbeard/notifiers/nma.py
index 028bbccb93089e9ede3da4caeaa6c59866d51c5f..52c3c0a4a82769f15bfc30a571f825990eb4963c 100644
--- a/sickbeard/notifiers/nma.py
+++ b/sickbeard/notifiers/nma.py
@@ -2,8 +2,9 @@
from __future__ import print_function, unicode_literals
-import sickbeard
from pynma import pynma
+
+import sickbeard
from sickbeard import common, logger
diff --git a/sickbeard/notifiers/nmj.py b/sickbeard/notifiers/nmj.py
index 2e90e5560f671fb07cbb7f5532e2958f3fc13dad..a6728a6a3462cd4294ca72a7ea3ec58c8c65060b 100644
--- a/sickbeard/notifiers/nmj.py
+++ b/sickbeard/notifiers/nmj.py
@@ -23,10 +23,11 @@ from __future__ import print_function, unicode_literals
import re
import telnetlib
+from six.moves import urllib
+
import sickbeard
from sickbeard import logger
from sickrage.helper.exceptions import ex
-from six.moves import urllib
try:
import xml.etree.cElementTree as etree
diff --git a/sickbeard/notifiers/nmjv2.py b/sickbeard/notifiers/nmjv2.py
index 0595ac42bab2d79e1174a9fd1884b3f6c12d0b82..b92e427b33224d0805349b4c271243e98c37c564 100644
--- a/sickbeard/notifiers/nmjv2.py
+++ b/sickbeard/notifiers/nmjv2.py
@@ -24,9 +24,10 @@ from __future__ import print_function, unicode_literals
import time
from xml.dom.minidom import parseString
+from six.moves import urllib
+
import sickbeard
from sickbeard import logger
-from six.moves import urllib
try:
import xml.etree.cElementTree as etree
diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py
index c91b516f4c903ab34dbcbdb7bbb80d778d160884..fc020dfe675636124fc417a8e1f7b5383dfe324f 100644
--- a/sickbeard/notifiers/plex.py
+++ b/sickbeard/notifiers/plex.py
@@ -22,8 +22,9 @@ from __future__ import print_function, unicode_literals
import re
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, logger
from sickbeard.helpers import getURL, make_session
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/prowl.py b/sickbeard/notifiers/prowl.py
index 3582480ad16291c6cf8ceb9f2e32cd3c6a171b8b..56c0da8df7f9d36b94ae677e772ed0f52ede0921 100644
--- a/sickbeard/notifiers/prowl.py
+++ b/sickbeard/notifiers/prowl.py
@@ -26,11 +26,12 @@ import ast
import socket
import time
-import sickbeard
from requests.compat import urlencode
+from six.moves.http_client import HTTPException, HTTPSConnection
+
+import sickbeard
from sickbeard import common, db, logger
from sickrage.helper.encoding import ss
-from six.moves.http_client import HTTPException, HTTPSConnection
try:
# this only exists in 2.6
diff --git a/sickbeard/notifiers/pushbullet.py b/sickbeard/notifiers/pushbullet.py
index 4f9a95af2b9c871cd285d4e74c70c6892913c3fd..b69e9d7937ad62fedcb7f024e2cc3dc8c691fbbd 100644
--- a/sickbeard/notifiers/pushbullet.py
+++ b/sickbeard/notifiers/pushbullet.py
@@ -22,8 +22,9 @@ from __future__ import unicode_literals
import re
-import sickbeard
from requests.compat import urljoin
+
+import sickbeard
from sickbeard import common, helpers, logger
diff --git a/sickbeard/notifiers/pushover.py b/sickbeard/notifiers/pushover.py
index 9c479b787fe009434d67deb28f5d755fd97e9b7c..1072ea74cb1da7b2a8666b6ef3fce4fa8a58ab24 100644
--- a/sickbeard/notifiers/pushover.py
+++ b/sickbeard/notifiers/pushover.py
@@ -23,12 +23,13 @@ from __future__ import print_function, unicode_literals
import time
+from six.moves import http_client, urllib
+
import sickbeard
from sickbeard import logger
from sickbeard.common import (NOTIFY_DOWNLOAD, NOTIFY_GIT_UPDATE, NOTIFY_GIT_UPDATE_TEXT, NOTIFY_LOGIN, NOTIFY_LOGIN_TEXT, NOTIFY_SNATCH,
NOTIFY_SUBTITLE_DOWNLOAD, notifyStrings)
from sickrage.helper.exceptions import ex
-from six.moves import http_client, urllib
API_URL = "https://api.pushover.net/1/messages.json"
diff --git a/sickbeard/notifiers/pytivo.py b/sickbeard/notifiers/pytivo.py
index 183bc719449a4fa1edbc0c16056848e38f5ae5c9..9031418123fba28ec22cde3756cf251c6ecdc51f 100644
--- a/sickbeard/notifiers/pytivo.py
+++ b/sickbeard/notifiers/pytivo.py
@@ -22,13 +22,14 @@ from __future__ import print_function, unicode_literals
import os
-import sickbeard
from requests.compat import urlencode
+from six.moves.urllib.error import HTTPError
+from six.moves.urllib.request import Request, urlopen
+
+import sickbeard
from sickbeard import logger
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
-from six.moves.urllib.error import HTTPError
-from six.moves.urllib.request import Request, urlopen
class Notifier(object):
diff --git a/sickbeard/notifiers/slack.py b/sickbeard/notifiers/slack.py
index 80a6771295df8465eba9c75ccc5911ad86d276e7..388b54d4a6a0821490fd76f6e5f87b969cb05190 100644
--- a/sickbeard/notifiers/slack.py
+++ b/sickbeard/notifiers/slack.py
@@ -21,8 +21,9 @@ from __future__ import unicode_literals
import json
import requests
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/telegram.py b/sickbeard/notifiers/telegram.py
index 496df590ae2161e23154f6ad246a467dfd795ee4..88e66cbf283a7e2bdb00cd96ddfebdb9c61c4e53 100644
--- a/sickbeard/notifiers/telegram.py
+++ b/sickbeard/notifiers/telegram.py
@@ -21,12 +21,13 @@
from __future__ import unicode_literals
+from six.moves import urllib
+
import sickbeard
from sickbeard import logger
from sickbeard.common import (NOTIFY_DOWNLOAD, NOTIFY_GIT_UPDATE, NOTIFY_GIT_UPDATE_TEXT, NOTIFY_LOGIN, NOTIFY_LOGIN_TEXT, NOTIFY_SNATCH,
NOTIFY_SUBTITLE_DOWNLOAD, notifyStrings)
from sickrage.helper import HTTP_STATUS_CODES
-from six.moves import urllib
class Notifier(object):
diff --git a/sickbeard/notifiers/trakt.py b/sickbeard/notifiers/trakt.py
index 12d537d9c316505c56ece23886b4e560d0fe761a..01264b4f5f038f629578b18c765d98f5d9323bc6 100644
--- a/sickbeard/notifiers/trakt.py
+++ b/sickbeard/notifiers/trakt.py
@@ -20,9 +20,10 @@
from __future__ import print_function, unicode_literals
-import sickbeard
from libtrakt import TraktAPI
from libtrakt.exceptions import traktAuthException, traktException, traktServerBusy
+
+import sickbeard
from sickbeard import logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/tweet.py b/sickbeard/notifiers/tweet.py
index 0a1152816be2b569a89e2f33f18cc772305101e0..07fe98aa4a4c2cbff157394cba8441528927d881 100644
--- a/sickbeard/notifiers/tweet.py
+++ b/sickbeard/notifiers/tweet.py
@@ -20,10 +20,11 @@
from __future__ import print_function, unicode_literals
-import sickbeard
import twitter
from requests.exceptions import RequestException
from requests_oauthlib import OAuth1Session
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/notifiers/twilio_notify.py b/sickbeard/notifiers/twilio_notify.py
index d2eaabf54fa4919f3dd39a60484af4aa9a66ee31..ae5960bd283aca80982cf04b46f8113a23b92401 100644
--- a/sickbeard/notifiers/twilio_notify.py
+++ b/sickbeard/notifiers/twilio_notify.py
@@ -22,8 +22,9 @@ from __future__ import print_function, unicode_literals
import re
-import sickbeard
import twilio
+
+import sickbeard
from sickbeard import common, logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/nzbget.py b/sickbeard/nzbget.py
index 3d2d3cc6d7ad05449edb931597c8d8d487cd3546..159735279b1d01e16711d0214ac02a8a95659643 100644
--- a/sickbeard/nzbget.py
+++ b/sickbeard/nzbget.py
@@ -23,11 +23,12 @@ from __future__ import unicode_literals
import datetime
from base64 import standard_b64encode
+from six.moves import http_client, xmlrpc_client
+
import sickbeard
from sickbeard import logger
from sickbeard.common import Quality
from sickrage.helper.common import try_int
-from six.moves import http_client, xmlrpc_client
def sendNZB(nzb, proper=False): # pylint: disable=too-many-locals, too-many-statements, too-many-branches, too-many-return-statements
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 83afdf76779a370a02f3cf7322cf1425532d44c2..98784257a9aef895af0404011f37d6782516e6ec 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -28,8 +28,9 @@ import stat
import subprocess
import adba
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, db, failed_history, helpers, history, logger, notifiers, show_name_helpers
from sickbeard.helpers import verify_freespace
from sickbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py
index 39a03745cf99bbf37bb14db85147832382087b52..ba68993329b15b1e12dbdda8de89962ad618fe6a 100644
--- a/sickbeard/processTV.py
+++ b/sickbeard/processTV.py
@@ -24,10 +24,11 @@ import os
import shutil
import stat
-import sickbeard
from rarfile import (BadRarFile, BadRarName, Error, NeedFirstVolume, NoCrypto, NoRarEntry, NotRarFile, PasswordRequired, RarCannotExec, RarCRCError,
RarCreateError, RarExecError, RarFatalError, RarFile, RarLockedArchiveError, RarMemoryError, RarNoFilesError, RarOpenError, RarSignalExit,
RarUnknownError, RarUserBreak, RarUserError, RarWarning, RarWriteError, RarWrongPassword)
+
+import sickbeard
from sickbeard import common, db, failedProcessor, helpers, logger, postProcessor
from sickbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
from sickrage.helper.common import is_sync_file, is_torrent_or_nzb_file
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index 015b9c948d54b229066caf4bb59a02cf18ff7a97..37ace85610cfa09e24eab97ba25ee361583ac4aa 100644
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -18,27 +18,25 @@
# 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 unicode_literals
+
from os import sys
from random import shuffle
import sickbeard
-from sickbeard.providers import btn, thepiratebay, torrentleech, iptorrents, torrentz, \
- omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, speedcd, nyaa, xthor, abnormal, torrentbytes, cpasbien, \
- torrent9, morethantv, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, \
- scenetime, nebulance, tvchaosuk, bitcannon, pretome, gftracker, hdspace, newpct, elitetorrent, danishbits, hd4free, limetorrents, \
- norbits, horriblesubs, filelist, skytorrents, ncore, archetorrent, hdtorrents_it, immortalseed, ilcorsaronero
+from sickbeard.providers import (abnormal, alpharatio, archetorrent, binsearch, bitcannon, btn, cpasbien, danishbits, elitetorrent, filelist, gftracker,
+ hd4free, hdbits, hdspace, hdtorrents, hdtorrents_it, horriblesubs, hounddawgs, ilcorsaronero, immortalseed, iptorrents,
+ limetorrents, morethantv, ncore, nebulance, newpct, norbits, nyaa, omgwtfnzbs, pretome, rarbg, scc, scenetime, shazbat,
+ skytorrents, speedcd, t411, thepiratebay, tntvillage, tokyotoshokan, torrent9, torrentbytes, torrentday, torrentleech,
+ torrentproject, torrentz, tvchaosuk, xthor)
__all__ = [
- 'btn', 'thepiratebay', 'torrentleech', 'scc', 'hdtorrents',
- 'torrentday', 'hdbits', 'hounddawgs', 'iptorrents', 'omgwtfnzbs',
- 'speedcd', 'nyaa', 'torrentbytes', 'cpasbien',
- 'torrent9','morethantv', 't411', 'tokyotoshokan', 'alpharatio',
- 'shazbat', 'rarbg', 'tntvillage', 'binsearch',
- 'xthor', 'abnormal', 'scenetime', 'nebulance', 'tvchaosuk',
- 'torrentproject', 'bitcannon', 'torrentz', 'pretome', 'gftracker',
- 'hdspace', 'newpct', 'elitetorrent', 'danishbits', 'hd4free', 'limetorrents',
- 'norbits', 'horriblesubs', 'filelist', 'skytorrents', 'ncore', 'archetorrent', 'hdtorrents_it',
- 'immortalseed', 'ilcorsaronero'
+ 'abnormal', 'alpharatio', 'archetorrent', 'binsearch', 'bitcannon', 'btn', 'cpasbien', 'danishbits',
+ 'elitetorrent', 'filelist', 'gftracker', 'hd4free', 'hdbits', 'hdspace', 'hdtorrents', 'hdtorrents_it',
+ 'horriblesubs', 'hounddawgs', 'ilcorsaronero', 'immortalseed', 'iptorrents', 'limetorrents', 'morethantv',
+ 'ncore', 'nebulance', 'newpct', 'norbits', 'nyaa', 'omgwtfnzbs', 'pretome', 'rarbg', 'scc', 'scenetime',
+ 'shazbat', 'skytorrents', 'speedcd', 't411', 'thepiratebay', 'tntvillage', 'tokyotoshokan', 'torrent9',
+ 'torrentbytes', 'torrentday', 'torrentleech', 'torrentproject', 'torrentz', 'tvchaosuk', 'xthor'
]
diff --git a/sickbeard/providers/abnormal.py b/sickbeard/providers/abnormal.py
index 21f3a7aca76a98a43246dc826c8177df0dafb92a..08d9145aeb0d585c21f01c15197374295c7e9133 100644
--- a/sickbeard/providers/abnormal.py
+++ b/sickbeard/providers/abnormal.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/alpharatio.py b/sickbeard/providers/alpharatio.py
index 73ee672a2d17574545180decf62f0f94b5eca649..2da95710fbc01bca20b11e9e542851e189a8ba7a 100644
--- a/sickbeard/providers/alpharatio.py
+++ b/sickbeard/providers/alpharatio.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/archetorrent.py b/sickbeard/providers/archetorrent.py
index 51e6c80a2fe795147dffa376d33a8467ad365afa..62b9d6e7cdf753466fc054d5726c05510a4e86cd 100644
--- a/sickbeard/providers/archetorrent.py
+++ b/sickbeard/providers/archetorrent.py
@@ -25,6 +25,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/binsearch.py b/sickbeard/providers/binsearch.py
index f9ae5b145ebcc15c8de51f81b3dfdf792757e6ab..38b436bb359bee053d58c4ef197dc23b340b2fc0 100644
--- a/sickbeard/providers/binsearch.py
+++ b/sickbeard/providers/binsearch.py
@@ -23,6 +23,7 @@ from __future__ import unicode_literals
import re
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickrage.providers.nzb.NZBProvider import NZBProvider
diff --git a/sickbeard/providers/bitcannon.py b/sickbeard/providers/bitcannon.py
index 7c01df08f8f178f7d8572c03ae9f347a16b67dfb..070c2d4cfd1c78d9eb23022cecac856745df563e 100644
--- a/sickbeard/providers/bitcannon.py
+++ b/sickbeard/providers/bitcannon.py
@@ -22,6 +22,7 @@ from __future__ import unicode_literals
import validators
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py
index 1e666336adc0d88d2de562207f6c9d7589dca6cc..b64e791cc1d0bfad60a39be1e00edbc3db0a6a49 100644
--- a/sickbeard/providers/btn.py
+++ b/sickbeard/providers/btn.py
@@ -26,8 +26,9 @@ import time
from datetime import datetime
import jsonrpclib
-import sickbeard
import six
+
+import sickbeard
from sickbeard import classes, logger, scene_exceptions, tvcache
from sickbeard.common import cpu_presets
from sickbeard.helpers import sanitizeSceneName
diff --git a/sickbeard/providers/danishbits.py b/sickbeard/providers/danishbits.py
index f9d831b4dd15c3b0f3d16cfd65a0e02a739d3a5c..ba708ad6fd7b6832de5676be0438b5d2dfe3c551 100644
--- a/sickbeard/providers/danishbits.py
+++ b/sickbeard/providers/danishbits.py
@@ -23,6 +23,7 @@ from __future__ import print_function, unicode_literals
import json
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/elitetorrent.py b/sickbeard/providers/elitetorrent.py
index 887ffecaf4c0ac27b5cb9861f5ee5f5c93fd0f11..b779ee68a48476882661c4f0996f0b9ff4b7212d 100644
--- a/sickbeard/providers/elitetorrent.py
+++ b/sickbeard/providers/elitetorrent.py
@@ -24,8 +24,9 @@ import re
import time
import traceback
-import sickbeard
import six
+
+import sickbeard
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickbeard.common import cpu_presets
diff --git a/sickbeard/providers/filelist.py b/sickbeard/providers/filelist.py
index af1787c9c41115b0798331c522a8c06b7389c084..68ffe902997d3ee7ea98cb4ba1a64f5563aebc8e 100644
--- a/sickbeard/providers/filelist.py
+++ b/sickbeard/providers/filelist.py
@@ -23,6 +23,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py
index e7f66274ca1025254b5e233558132e51dcd6bb57..b0499471978701fe8265811b5ec96d1eb073a22d 100644
--- a/sickbeard/providers/gftracker.py
+++ b/sickbeard/providers/gftracker.py
@@ -23,6 +23,7 @@ from __future__ import print_function, unicode_literals
import re
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/hd4free.py b/sickbeard/providers/hd4free.py
index 5d96d6c7c83c09fb66ea081b1deeb3e5075263ee..143ca9c8f20949fd42043b75a853998275d63fed 100644
--- a/sickbeard/providers/hd4free.py
+++ b/sickbeard/providers/hd4free.py
@@ -21,6 +21,7 @@
from __future__ import print_function, unicode_literals
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/hdbits.py b/sickbeard/providers/hdbits.py
index 9eef83b95b03bfd7788bd601fe0597ce7c9acf1e..fca362aa848253d7de3b1da205110403bf0dda87 100644
--- a/sickbeard/providers/hdbits.py
+++ b/sickbeard/providers/hdbits.py
@@ -22,6 +22,7 @@ from __future__ import print_function, unicode_literals
import datetime
from requests.compat import urlencode, urljoin
+
from sickbeard import classes, logger, tvcache
from sickrage.helper.exceptions import AuthException
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/hdspace.py b/sickbeard/providers/hdspace.py
index 7a63b7170c1c47fbd6368552df1ac856ff2973f8..cc7aa1cba56acadb13803fe19f1ecb855b56fec6 100644
--- a/sickbeard/providers/hdspace.py
+++ b/sickbeard/providers/hdspace.py
@@ -25,10 +25,11 @@ import re
from bs4 import BeautifulSoup
from requests.utils import dict_from_cookiejar
+from six.moves.urllib.parse import quote_plus
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-from six.moves.urllib.parse import quote_plus
class HDSpaceProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py
index 6de831554adee3f7535ff18058c391f9fc0b0955..4f1e7eb3640e1206e10596147e0742b1182d6469 100644
--- a/sickbeard/providers/hdtorrents.py
+++ b/sickbeard/providers/hdtorrents.py
@@ -23,11 +23,12 @@ from __future__ import print_function, unicode_literals
import re
from requests.utils import dict_from_cookiejar
+from six.moves.urllib.parse import quote_plus
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-from six.moves.urllib.parse import quote_plus
class HDTorrentsProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
diff --git a/sickbeard/providers/hdtorrents_it.py b/sickbeard/providers/hdtorrents_it.py
index 5c430cc93a9e083e8f00777c3865656eb5d38758..9de585f1141e8607c6917d1226e7b249e1f5d7e8 100644
--- a/sickbeard/providers/hdtorrents_it.py
+++ b/sickbeard/providers/hdtorrents_it.py
@@ -23,11 +23,12 @@ from __future__ import print_function, unicode_literals
import re
from requests.utils import dict_from_cookiejar
+from six.moves.urllib.parse import quote_plus
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-from six.moves.urllib.parse import quote_plus
class HDTorrentsProvider_IT(TorrentProvider): # pylint: disable=too-many-instance-attributes
diff --git a/sickbeard/providers/hounddawgs.py b/sickbeard/providers/hounddawgs.py
index 6b8b8ebc037fad6391358cd35fafd0d221b49c96..6a2e7289978df18f02372564490b778c850f4a43 100644
--- a/sickbeard/providers/hounddawgs.py
+++ b/sickbeard/providers/hounddawgs.py
@@ -24,6 +24,7 @@ import re
import traceback
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/ilcorsaronero.py b/sickbeard/providers/ilcorsaronero.py
index 15736c48b8caad22b84e05ba1f1f2b6dbf04dbff..abaf6f639be334f95cad26b9f898e92b391e4871 100644
--- a/sickbeard/providers/ilcorsaronero.py
+++ b/sickbeard/providers/ilcorsaronero.py
@@ -23,6 +23,7 @@ import re
import six
from requests.compat import quote_plus, urljoin
+
from sickbeard import db, logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickbeard.common import Quality
diff --git a/sickbeard/providers/immortalseed.py b/sickbeard/providers/immortalseed.py
index 412766acdee3002ac6d588420226ca48d429b8f2..88e2a6bd3ab0cf7dfec82e59e861cfd5a3650dab 100755
--- a/sickbeard/providers/immortalseed.py
+++ b/sickbeard/providers/immortalseed.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py
index d3e5a22f750ff9180e53c22562885aac854591fd..927ecf2c1fced07b4a5abb76ec1cf2c8342b291d 100644
--- a/sickbeard/providers/iptorrents.py
+++ b/sickbeard/providers/iptorrents.py
@@ -25,6 +25,7 @@ import re
import validators
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
index 996764f5bf6870ded0aeca76e6e1ebff3bac8314..4dd38fe797f44b88578bca90189cae15a3a4f0d5 100644
--- a/sickbeard/providers/kat.py
+++ b/sickbeard/providers/kat.py
@@ -19,9 +19,10 @@
from __future__ import unicode_literals
-import sickbeard
import validators
from requests.compat import urljoin
+
+import sickbeard
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/limetorrents.py b/sickbeard/providers/limetorrents.py
index b8be2c2e9d7f88f69bcdde0d205f719afc8481ae..3578a0b25ca526db206b466a5dcd558fb2c532fc 100644
--- a/sickbeard/providers/limetorrents.py
+++ b/sickbeard/providers/limetorrents.py
@@ -23,8 +23,9 @@ from __future__ import print_function, unicode_literals
import re
import traceback
-import sickbeard
from bs4 import BeautifulSoup
+
+import sickbeard
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py
index 901bec3a2f87fdd2abcfdffe8dfe02df920adb2e..ee985c2139c0eaa19a72e502c74ccfac0bd4b36a 100644
--- a/sickbeard/providers/morethantv.py
+++ b/sickbeard/providers/morethantv.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickbeard.show_name_helpers import allPossibleShowNames
diff --git a/sickbeard/providers/nebulance.py b/sickbeard/providers/nebulance.py
index 70d88217afffa0404a1f30694cb2d3c29287e5ac..ce5b0b2756cdd5aedb2e6da728cb2c987bac4d4f 100644
--- a/sickbeard/providers/nebulance.py
+++ b/sickbeard/providers/nebulance.py
@@ -24,6 +24,7 @@ import traceback
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import try_int
diff --git a/sickbeard/providers/newpct.py b/sickbeard/providers/newpct.py
index afe21f2c47db554d0c39446eba902f036ab1575a..556568866e673a962f24d0ca89c005e3a5cb87da 100644
--- a/sickbeard/providers/newpct.py
+++ b/sickbeard/providers/newpct.py
@@ -23,6 +23,7 @@ from __future__ import print_function, unicode_literals
import re
from requests.compat import urljoin
+
from sickbeard import helpers, logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size
diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
index 4a1efaac494784d49ac6d98ac9f05b2264c8dbaf..83bff45bc8662b685ae9a22071ef0279c3adae4c 100644
--- a/sickbeard/providers/newznab.py
+++ b/sickbeard/providers/newznab.py
@@ -24,9 +24,10 @@ import os
import re
import time
-import sickbeard
import validators
from requests.compat import urljoin
+
+import sickbeard
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickbeard.common import cpu_presets
diff --git a/sickbeard/providers/norbits.py b/sickbeard/providers/norbits.py
index 6c762c204b4bc6c277e0aa2b925ae0baecaedc91..196083a6ba5f809773221793caaaf9efc2d97af3 100644
--- a/sickbeard/providers/norbits.py
+++ b/sickbeard/providers/norbits.py
@@ -21,6 +21,7 @@
from __future__ import unicode_literals
from requests.compat import urlencode
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.helper.exceptions import AuthException
diff --git a/sickbeard/providers/pretome.py b/sickbeard/providers/pretome.py
index b91faacdafe32c4d6052661c14119f0c34cd222d..8db6411266d1e7bb7ace08723f9d8b31fab0590f 100644
--- a/sickbeard/providers/pretome.py
+++ b/sickbeard/providers/pretome.py
@@ -24,12 +24,13 @@ import re
import traceback
from requests.utils import dict_from_cookiejar
+# noinspection PyUnresolvedReferences
+from six.moves.urllib.parse import quote
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-# noinspection PyUnresolvedReferences
-from six.moves.urllib.parse import quote
class PretomeProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
diff --git a/sickbeard/providers/rsstorrent.py b/sickbeard/providers/rsstorrent.py
index eb6395a7eb3158096b2fcd5130dd603275003507..c845b4a5add8c0a2e7b39b82fa9cf2c3b126d8e9 100644
--- a/sickbeard/providers/rsstorrent.py
+++ b/sickbeard/providers/rsstorrent.py
@@ -24,9 +24,10 @@ import io
import os
import re
-import sickbeard
from bencode.BTL import BTFailure
from requests.utils import add_dict_to_cookiejar
+
+import sickbeard
from sickbeard import helpers, logger, tvcache
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/providers/scc.py b/sickbeard/providers/scc.py
index b569b94452cdea6757236fca55667eb577c7dce3..026618fb3ffc9528e500017c4f9232dc0027929d 100644
--- a/sickbeard/providers/scc.py
+++ b/sickbeard/providers/scc.py
@@ -23,15 +23,16 @@ from __future__ import print_function, unicode_literals
import re
import time
-import sickbeard
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+from six.moves.urllib.parse import quote
+
+import sickbeard
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickbeard.common import cpu_presets
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-from six.moves.urllib.parse import quote
class SCCProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
diff --git a/sickbeard/providers/scenetime.py b/sickbeard/providers/scenetime.py
index 5c322d2ddf8e5d345bd89b9dd0f4633025cc33db..c5f04e0335a7ad15eab7e3a5f31e0c30fc2b490c 100644
--- a/sickbeard/providers/scenetime.py
+++ b/sickbeard/providers/scenetime.py
@@ -21,6 +21,7 @@
from __future__ import print_function, unicode_literals
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/shazbat.py b/sickbeard/providers/shazbat.py
index 875ac518cdb0a7326c33b3eb66f45d9cfe2c12d7..40ed2a1af65d83a57ad1bccca56fcccfa46e230a 100644
--- a/sickbeard/providers/shazbat.py
+++ b/sickbeard/providers/shazbat.py
@@ -21,6 +21,7 @@
from __future__ import unicode_literals
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickrage.helper.exceptions import AuthException
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/skytorrents.py b/sickbeard/providers/skytorrents.py
index ba1717012420922438c2ff6c420ec99b1cdba088..99c9f7c4e1b5be243312b620834ada26af261a55 100644
--- a/sickbeard/providers/skytorrents.py
+++ b/sickbeard/providers/skytorrents.py
@@ -23,6 +23,7 @@ import re
import validators
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py
index 34086dda82ddf0da7701134c95a7dd91200af8c7..9e74893d36354baea643f4492370e852312dc02d 100644
--- a/sickbeard/providers/speedcd.py
+++ b/sickbeard/providers/speedcd.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/t411.py b/sickbeard/providers/t411.py
index 24f67b0c94d912a2870b0cbd32a5b0f5ec2cb1a0..9d9b7a86b9b159625e6bdf27353f66742409fcad 100644
--- a/sickbeard/providers/t411.py
+++ b/sickbeard/providers/t411.py
@@ -25,6 +25,7 @@ import traceback
import six
from requests.auth import AuthBase
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/thepiratebay.py b/sickbeard/providers/thepiratebay.py
index 27d624e5f0f87c5f10d05b57e2e172cbc40ef037..57f2af45da23992dd81e5bf658aaac4602a0d5b9 100644
--- a/sickbeard/providers/thepiratebay.py
+++ b/sickbeard/providers/thepiratebay.py
@@ -24,6 +24,7 @@ import re
import validators
from requests.compat import urljoin
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py
index 8aa4d38aeabe9c3aa030d934ee8fa06ad6025666..170a28af039dbd53fd98c98d56ca8c9b7b347048 100644
--- a/sickbeard/providers/torrentbytes.py
+++ b/sickbeard/providers/torrentbytes.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/torrentday.py b/sickbeard/providers/torrentday.py
index 20908025fc103831fb3008324b1e5a07e84150bc..b07acbb15d66fceaba4e69d0a1225c5b9444d00c 100644
--- a/sickbeard/providers/torrentday.py
+++ b/sickbeard/providers/torrentday.py
@@ -25,6 +25,7 @@ import re
import validators
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/providers/torrentleech.py b/sickbeard/providers/torrentleech.py
index 91d0f23450fa0dd4e6d545489d3e57f0ca60aa43..b8b5dc6266a4341a7281206db8c374338b2e4f87 100644
--- a/sickbeard/providers/torrentleech.py
+++ b/sickbeard/providers/torrentleech.py
@@ -24,6 +24,7 @@ import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
+
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
diff --git a/sickbeard/providers/torrentproject.py b/sickbeard/providers/torrentproject.py
index 0f6d31295620afc5c6529a882311edf575710d4c..a598c9f41ebfd5e111506c12b168c96dd2883d30 100644
--- a/sickbeard/providers/torrentproject.py
+++ b/sickbeard/providers/torrentproject.py
@@ -21,6 +21,7 @@
from __future__ import print_function, unicode_literals
import validators
+
from sickbeard import logger, tvcache
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
diff --git a/sickbeard/rssfeeds.py b/sickbeard/rssfeeds.py
index 5d8f7d22f582c30c0065dcdf9fd4fb8acf72d336..979694777e20c659d3ff9de255a83ddf62f9c393 100644
--- a/sickbeard/rssfeeds.py
+++ b/sickbeard/rssfeeds.py
@@ -2,6 +2,7 @@
from __future__ import print_function, unicode_literals
from feedparser.api import parse
+
from sickbeard import logger
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/sab.py b/sickbeard/sab.py
index f6e256d7d1c362cdc0bf6104567c5a18ccb1928d..e2dd536f2d9985973a27d680e6870b1abbd41f9e 100644
--- a/sickbeard/sab.py
+++ b/sickbeard/sab.py
@@ -22,8 +22,9 @@ from __future__ import unicode_literals
import datetime
-import sickbeard
from requests.compat import urljoin
+
+import sickbeard
from sickbeard import helpers, logger
session = helpers.make_session()
diff --git a/sickbeard/scene_exceptions.py b/sickbeard/scene_exceptions.py
index 2880d0fc54b47fa428004a5a100b359227e4d30d..c7ca1f5e73b3dac08d6fef6fe107ed934a0cf8d7 100644
--- a/sickbeard/scene_exceptions.py
+++ b/sickbeard/scene_exceptions.py
@@ -25,8 +25,9 @@ import threading
import time
import adba
-import sickbeard
import six
+
+import sickbeard
from sickbeard import db, helpers, logger
from sickbeard.indexers.indexer_config import INDEXER_TVDB
diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index cfdb3b6b61e82aeb443d69674c04b5454af939de..c55a0f8cae79092e36c7f707e07a3419e8180ca5 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -22,8 +22,9 @@ from __future__ import print_function, unicode_literals
import datetime
import threading
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, db, logger, scheduler, search_queue, ui
diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index d0a9a40ba7309d388911fac18151b3b9b5fe8d9b..f41a804ded28e233e7d191785b549f360e4c2b3a 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -23,8 +23,9 @@ import fnmatch
import os
import re
-import sickbeard
import six
+
+import sickbeard
from sickbeard import common, logger
from sickbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
from sickbeard.scene_exceptions import get_scene_exceptions
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index 39ba26b259e54c9463a2d16a6ffbf98c89720018..9165c613a6d95c936a221fd984c6fa7a769dde88 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -23,10 +23,11 @@ import os
import traceback
from collections import namedtuple
-import sickbeard
import six
from imdb import _exceptions as imdb_exceptions
from libtrakt import TraktAPI
+
+import sickbeard
from sickbeard import generic_queue, logger, name_cache, notifiers, ui
from sickbeard.blackandwhitelist import BlackAndWhiteList
from sickbeard.common import WANTED
diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py
index 20139e33824302cea76b1b5f84af33af4cfbf8dd..2adeb434810a7c149ae7cc4ff8060db3b2408226 100644
--- a/sickbeard/subtitles.py
+++ b/sickbeard/subtitles.py
@@ -28,18 +28,19 @@ import subprocess
import threading
import traceback
-import sickbeard
import six
import subliminal
from babelfish import Language, language_converters
from guessit import guessit
+from subliminal import Episode, provider_manager, ProviderPool
+
+import sickbeard
from sickbeard import db, history, logger
from sickbeard.common import Quality
from sickbeard.helpers import is_media_file
from sickrage.helper.common import dateTimeFormat, episode_num
from sickrage.helper.exceptions import ex
from sickrage.show.Show import Show
-from subliminal import Episode, provider_manager, ProviderPool
# https://github.com/Diaoul/subliminal/issues/536
# provider_manager.register('napiprojekt = subliminal.providers.napiprojekt:NapiProjektProvider')
diff --git a/sickbeard/traktChecker.py b/sickbeard/traktChecker.py
index 2cb650c5a0bd0c10b86a5afcb35ccb2c9f3e1255..a728312ccd12ded6f3d68509420c073f4f94b13d 100644
--- a/sickbeard/traktChecker.py
+++ b/sickbeard/traktChecker.py
@@ -23,9 +23,10 @@ import datetime
import os
import traceback
-import sickbeard
from libtrakt import TraktAPI
from libtrakt.exceptions import traktException
+
+import sickbeard
from sickbeard import db, helpers, logger, search_queue
from sickbeard.common import Quality, SKIPPED, UNKNOWN, WANTED
from sickrage.helper.common import episode_num, sanitize_filename
diff --git a/sickbeard/traktTrending.py b/sickbeard/traktTrending.py
index ccae94d1ea8fbe67e0947629d9a1aa44245dd8d8..7fb2886d6f166cbeef63cf6566559de13645c79b 100644
--- a/sickbeard/traktTrending.py
+++ b/sickbeard/traktTrending.py
@@ -5,9 +5,10 @@ from __future__ import print_function, unicode_literals
import os
import posixpath
-import sickbeard
from libtrakt.exceptions import traktException
from libtrakt.trakt import TraktAPI
+
+import sickbeard
from sickbeard import helpers, logger
from sickbeard.indexers.indexer_config import INDEXER_TVDB
from sickrage.helper.encoding import ek
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 12d937ed590bcbfc6e7e202f3161f5643b888db9..180fe38b569dcacdf7a15e2dd7a4e028cb308aef 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -28,9 +28,11 @@ import stat
import threading
import traceback
-import sickbeard
import six
from imdb import imdb
+from unidecode import unidecode
+
+import sickbeard
from sickbeard import db, helpers, image_cache, logger, network_timezones, notifiers, postProcessor, subtitles
from sickbeard.blackandwhitelist import BlackAndWhiteList
from sickbeard.common import (ARCHIVED, DOWNLOADED, FAILED, IGNORED, NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_LIMITED_EXTEND_E_PREFIXED,
@@ -44,7 +46,6 @@ from sickrage.helper.exceptions import (EpisodeDeletedException, EpisodeNotFound
MultipleShowObjectsException, MultipleShowsInDatabaseException, NoNFOException, ShowDirectoryNotFoundException,
ShowNotFoundException)
from sickrage.show.Show import Show
-from unidecode import unidecode
try:
import xml.etree.cElementTree as etree
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index a5632473a30bd8c81f9a37fc2c784c8bc9996579..71c1c8d88f5c1d53fa091762afded88e751bc307 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -23,8 +23,9 @@ import datetime
import itertools
import time
-import sickbeard
import six
+
+import sickbeard
from sickbeard import db, logger, show_name_helpers
from sickbeard.name_parser.parser import InvalidNameException, InvalidShowException, NameParser
from sickbeard.rssfeeds import getFeed
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index 7aeeb7876d55e944f21bab2d650967d02ea8a511..7e2ac353894248d4b5efdb87a99b79623b3492a9 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -30,8 +30,9 @@ import tarfile
import time
import traceback
-import sickbeard
import six
+
+import sickbeard
from sickbeard import db, helpers, logger, notifiers, ui
from sickrage.helper.encoding import ek
from sickrage.helper.exceptions import ex
diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py
index 9cb4a01c9ea051e2dbe9781701bc7dc41e5e7b60..c108fa7e31409701b110101fe2e448ebfe44f9bc 100644
--- a/sickbeard/webapi.py
+++ b/sickbeard/webapi.py
@@ -31,8 +31,12 @@ import re
import time
import traceback
-import sickbeard
import six
+# noinspection PyUnresolvedReferences
+from six.moves import urllib
+from tornado.web import RequestHandler
+
+import sickbeard
from sickbeard import classes, db, helpers, image_cache, logger, network_timezones, sbdatetime, search_queue, ui
from sickbeard.common import (ARCHIVED, DOWNLOADED, FAILED, IGNORED, Overview, Quality, SKIPPED, SNATCHED, SNATCHED_PROPER, statusStrings, UNAIRED, UNKNOWN,
WANTED)
@@ -51,10 +55,6 @@ from sickrage.show.History import History
from sickrage.show.Show import Show
from sickrage.system.Restart import Restart
from sickrage.system.Shutdown import Shutdown
-# noinspection PyUnresolvedReferences
-from six.moves import urllib
-# pylint: disable=import-error
-from tornado.web import RequestHandler
try:
import json
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index a4a6aa688c07789e273a16d345c5a70623fee5b4..59610186bf537bb362e21236bb0c489a844dfe4c 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -34,7 +34,6 @@ from operator import attrgetter
import adba
import markdown2
-import sickbeard
import six
from dateutil import tz
from libtrakt import TraktAPI
@@ -44,6 +43,18 @@ from mako.lookup import TemplateLookup
from mako.runtime import UNDEFINED
from mako.template import Template as MakoTemplate
from requests.compat import urljoin
+# noinspection PyUnresolvedReferences
+from six.moves import urllib
+# noinspection PyUnresolvedReferences
+from six.moves.urllib.parse import unquote_plus
+from tornado.concurrent import run_on_executor
+from tornado.gen import coroutine
+from tornado.ioloop import IOLoop
+from tornado.process import cpu_count
+from tornado.routes import route
+from tornado.web import authenticated, HTTPError, RequestHandler, StaticFileHandler
+
+import sickbeard
from sickbeard import classes, clients, config, db, helpers, logger, naming, network_timezones, notifiers, sab, search_queue, subtitles as subtitle_module, ui
from sickbeard.blackandwhitelist import BlackAndWhiteList, short_group_names
from sickbeard.browser import foldersAtPath
@@ -72,16 +83,6 @@ from sickrage.show.History import History as HistoryTool
from sickrage.show.Show import Show
from sickrage.system.Restart import Restart
from sickrage.system.Shutdown import Shutdown
-# noinspection PyUnresolvedReferences
-from six.moves import urllib
-# noinspection PyUnresolvedReferences
-from six.moves.urllib.parse import unquote_plus
-from tornado.concurrent import run_on_executor
-from tornado.gen import coroutine
-from tornado.ioloop import IOLoop
-from tornado.process import cpu_count
-from tornado.routes import route
-from tornado.web import authenticated, HTTPError, RequestHandler, StaticFileHandler
try:
import json
diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py
index c046d3ccdf89d5a1d04337477c62efe809f73e67..1c80276511c4f62e026a05d4051f254b22aa3235 100644
--- a/sickbeard/webserveInit.py
+++ b/sickbeard/webserveInit.py
@@ -6,15 +6,16 @@ import os
import threading
from socket import errno, error as SocketError
+from tornado.ioloop import IOLoop
+from tornado.routes import route
+from tornado.web import Application, RedirectHandler, StaticFileHandler
+
import sickbeard
from sickbeard import logger
from sickbeard.helpers import create_https_certificates, generateApiKey
from sickbeard.webapi import ApiHandler
from sickbeard.webserve import CalendarHandler, KeyHandler, LoginHandler, LogoutHandler
from sickrage.helper.encoding import ek
-from tornado.ioloop import IOLoop
-from tornado.routes import route
-from tornado.web import Application, RedirectHandler, StaticFileHandler
class SRWebServer(threading.Thread): # pylint: disable=too-many-instance-attributes
diff --git a/sickrage/__init__.py b/sickrage/__init__.py
index 9bad5790a5799b96f2e164d825c0b1f8ec0c2dfb..705411070cacbd6a3b6b9b0b40029bd754e4b904 100644
--- a/sickrage/__init__.py
+++ b/sickrage/__init__.py
@@ -1 +1,2 @@
# coding=utf-8
+from __future__ import unicode_literals
diff --git a/sickrage/helper/__init__.py b/sickrage/helper/__init__.py
index 48253b67629edb75aca8b6db4311944b8653cf8a..87a5c780293ce8251faf79eb0011ea6d46d84649 100644
--- a/sickrage/helper/__init__.py
+++ b/sickrage/helper/__init__.py
@@ -1,4 +1,6 @@
# coding=utf-8
-from common import setup_github, pretty_file_size, episode_num, CUSTOM_GLOB as glob, \
- HTTP_STATUS_CODES, MEDIA_EXTENSIONS, SUBTITLE_EXTENSIONS, try_int, sanitize_filename
+from __future__ import unicode_literals
+
+from common import (CUSTOM_GLOB as glob, episode_num, HTTP_STATUS_CODES, MEDIA_EXTENSIONS, pretty_file_size, sanitize_filename, setup_github,
+ SUBTITLE_EXTENSIONS, try_int)
from media_info import video_screen_size
diff --git a/sickrage/helper/common.py b/sickrage/helper/common.py
index b53478c66b6dbdd76916388224bcfdac934e1c3a..adcf3512dbfc8082a986c33919e6c32380bca5d6 100644
--- a/sickrage/helper/common.py
+++ b/sickrage/helper/common.py
@@ -28,11 +28,12 @@ import os
import re
from fnmatch import fnmatch
-import sickbeard
import six
from github import Github
from github.GithubException import BadCredentialsException, TwoFactorException
+import sickbeard
+
dateFormat = '%Y-%m-%d'
dateTimeFormat = '%Y-%m-%d %H:%M:%S'
# Mapping HTTP status codes to official W3C names
diff --git a/sickrage/helper/encoding.py b/sickrage/helper/encoding.py
index b13fc39d3ebe06802f646bb1db50b26aa7972035..6743ba895e2bf695db48ed719b13f67b85815739 100644
--- a/sickrage/helper/encoding.py
+++ b/sickrage/helper/encoding.py
@@ -22,10 +22,11 @@ from __future__ import unicode_literals
from os import name
-import sickbeard
import six
from chardet import detect
+import sickbeard
+
def ek(function, *args, **kwargs):
"""
diff --git a/sickrage/helper/exceptions.py b/sickrage/helper/exceptions.py
index ad88e7db951ba341ad4f176e7c8226494960acba..86926a05937f57fb5a0ddd89c35ccb796430f15f 100644
--- a/sickrage/helper/exceptions.py
+++ b/sickrage/helper/exceptions.py
@@ -20,6 +20,7 @@
from __future__ import print_function, unicode_literals
import six
+
from sickrage.helper.encoding import ss
diff --git a/sickrage/helper/media_info.py b/sickrage/helper/media_info.py
index 02edf21a61158fd3728e94403870de8a3fa3746f..6e835ba6ae2acc51b3fd66a2f8ac4b4f64acfbf0 100644
--- a/sickrage/helper/media_info.py
+++ b/sickrage/helper/media_info.py
@@ -23,11 +23,11 @@ from __future__ import print_function, unicode_literals
import binascii
import io
+import six
+from enzyme import MKV
from pkg_resources import DistributionNotFound, get_distribution
import sickbeard
-import six
-from enzyme import MKV
try:
get_distribution('pymediainfo')
diff --git a/sickrage/media/__init__.py b/sickrage/media/__init__.py
index 4ca69730f8248471685f1f6fc8a5eaeedff45088..91897d7fbffd768686f1b05f80ff59026df76028 100644
--- a/sickrage/media/__init__.py
+++ b/sickrage/media/__init__.py
@@ -1,2 +1,4 @@
# coding=utf-8
+from __future__ import unicode_literals
+
__all__ = ['ShowBanner', 'ShowFanArt', 'ShowNetworkLogo', 'ShowPoster']
diff --git a/sickrage/providers/GenericProvider.py b/sickrage/providers/GenericProvider.py
index b61575f60e59aa657925a995b5090a4f75e55769..b1de4591b82570ad85f29c0218126c7453f1197e 100644
--- a/sickrage/providers/GenericProvider.py
+++ b/sickrage/providers/GenericProvider.py
@@ -26,9 +26,10 @@ from itertools import chain
from os.path import join
from random import shuffle
-import sickbeard
import six
from requests.utils import add_dict_to_cookiejar
+
+import sickbeard
from sickbeard import logger
from sickbeard.classes import Proper, SearchResult
from sickbeard.common import MULTI_EP_RESULT, Quality, SEASON_RESULT, UA_POOL
diff --git a/sickrage/providers/__init__.py b/sickrage/providers/__init__.py
index 4eb43219ca97e9c23699aa31f643f27c7f58986e..02ec77aa8fd8c564bf3072f7bcbdd74379e1265a 100644
--- a/sickrage/providers/__init__.py
+++ b/sickrage/providers/__init__.py
@@ -1,2 +1,4 @@
# coding=utf-8
+from __future__ import unicode_literals
+
__all__ = []
diff --git a/sickrage/providers/torrent/TorrentProvider.py b/sickrage/providers/torrent/TorrentProvider.py
index 4800ca51c5fe188d188451ca7096779bf20f9cf4..72fbe729b31489d3e9ecfa6b6242b9f6b388a624 100644
--- a/sickrage/providers/torrent/TorrentProvider.py
+++ b/sickrage/providers/torrent/TorrentProvider.py
@@ -21,9 +21,10 @@ from __future__ import unicode_literals
from datetime import datetime
-import sickbeard
from feedparser.util import FeedParserDict
from hachoir_parser import createParser
+
+import sickbeard
from sickbeard import logger
from sickbeard.classes import Proper, TorrentSearchResult
from sickbeard.common import Quality
diff --git a/sickrage/show/History.py b/sickrage/show/History.py
index ec311c890bcda7e76480299cf5d4015e5ba317be..bd4049a4ba34b46c08be52993fa5917341ba340b 100644
--- a/sickrage/show/History.py
+++ b/sickrage/show/History.py
@@ -22,6 +22,7 @@ from __future__ import unicode_literals
from datetime import datetime, timedelta
import six
+
from sickbeard.common import Quality
from sickbeard.db import DBConnection
from sickrage.helper.common import try_int
diff --git a/sickrage/show/__init__.py b/sickrage/show/__init__.py
index d153353143bf006044f9ca3bf001a742a040fe35..2c8a6b20c5db008686cf27a966073da84a96f946 100644
--- a/sickrage/show/__init__.py
+++ b/sickrage/show/__init__.py
@@ -1,2 +1,4 @@
# coding=utf-8
+from __future__ import unicode_literals
+
__all__ = ['ComingEpisodes', 'History', 'Show']
diff --git a/sickrage/show/recommendations/__init__.py b/sickrage/show/recommendations/__init__.py
index bd4ad8f91b29bb6026525e0c4a461286bdd68d33..4ef972272c8b82c9ffab79e7a4eb8d83db82fc67 100644
--- a/sickrage/show/recommendations/__init__.py
+++ b/sickrage/show/recommendations/__init__.py
@@ -1,3 +1,4 @@
# coding=utf-8
+from __future__ import unicode_literals
__all__ = ['anidb', 'imdb', 'trakt']
diff --git a/sickrage/show/recommendations/anidb.py b/sickrage/show/recommendations/anidb.py
index 10eef9753a2e3df7a909c76c83828905ac88956d..2f6a9a67df998a9edff8421d4694b2305a54b453 100644
--- a/sickrage/show/recommendations/anidb.py
+++ b/sickrage/show/recommendations/anidb.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
from anidbhttp import anidbquery
from anidbhttp.query import QUERY_HOT
from recommended import RecommendedShow
+
from sickbeard import helpers
from sickrage.helper.common import try_int
diff --git a/sickrage/show/recommendations/imdb.py b/sickrage/show/recommendations/imdb.py
index c098af316d8678b3cf473b7d7827932e02c21743..e4da95d1b3a05382eca1dcbb814732ad1c22cbfa 100644
--- a/sickrage/show/recommendations/imdb.py
+++ b/sickrage/show/recommendations/imdb.py
@@ -7,8 +7,9 @@ import posixpath
import re
from datetime import date
-import sickbeard
from bs4 import BeautifulSoup
+
+import sickbeard
from sickbeard import helpers
from sickrage.helper.encoding import ek
diff --git a/sickrage/system/__init__.py b/sickrage/system/__init__.py
index f9ae594a304d951c68b115d6c8623cbb7421e80c..5ba8d09fad04375df6a406ee4a47d42dffdf0b4a 100644
--- a/sickrage/system/__init__.py
+++ b/sickrage/system/__init__.py
@@ -1,2 +1,4 @@
# coding=utf-8
+from __future__ import unicode_literals
+
__all__ = ['Restart', 'Shutdown']