Fixing import order

sickbeard/name_parser/guessit_parser.py

@@ -7,10 +7,8 @@
 
 from guessit.api import default_api
 from guessit.rules.common.date import valid_year
-
-import six
-
 import sickbeard
+import six
 
 # hardcoded expected titles
 fixed_expected_titles = {

sickbeard/providers/torrent/html/freshontv.py

@@ -24,13 +24,11 @@
 
 from requests.compat import urljoin
 from requests.utils import add_dict_to_cookiejar, dict_from_cookiejar
-from six import text_type
-
 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 import text_type
 
 
 class FreshOnTVProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes

sickbeard/subtitles.py

@@ -31,18 +31,16 @@
 
 from babelfish import Language, language_converters
 from dogpile.cache.api import NO_VALUE
+import sickbeard
+from sickrage.helper.common import dateTimeFormat, episode_num, subtitle_extensions
+from sickrage.helper.exceptions import ex
+from sickrage.show.Show import Show
 from six import iteritems, string_types, text_type
 from subliminal import (ProviderPool, compute_score, provider_manager, refine, refiner_manager, region, save_subtitles,
                         scan_video)
 from subliminal.core import search_external_subtitles
 from subliminal.score import episode_scores
 from subliminal.subtitle import get_subtitle_path
-
-import sickbeard
-from sickrage.helper.common import dateTimeFormat, episode_num, subtitle_extensions
-from sickrage.helper.exceptions import ex
-from sickrage.show.Show import Show
-
 from . import db, history, processTV
 from .common import cpu_presets
 from .helpers import isMediaFile, isRarFile, remove_non_release_groups

sickbeard/tv.py

@@ -29,10 +29,7 @@
 
 from imdb import imdb
 import shutil_custom
-from six import text_type
-
 import sickbeard
-
 from sickrage.helper.common import (
     dateTimeFormat, episode_num, remove_extension, replace_extension, sanitize_filename, try_int
 )
@@ -43,7 +40,7 @@
     ShowNotFoundException, ex
 )
 from sickrage.show.Show import Show
-
+from six import text_type
 from . import db, helpers, image_cache, logger, network_timezones, notifiers, postProcessor, subtitles
 from .blackandwhitelist import BlackAndWhiteList
 from .common import (
@@ -55,7 +52,6 @@
 from .name_parser.parser import InvalidNameException, InvalidShowException, NameParser
 from .scene_numbering import get_scene_absolute_numbering, get_scene_numbering, xem_refresh
 
-
 try:
     import xml.etree.cElementTree as ETree
 except ImportError:

tests/test_guessit.py

@@ -4,21 +4,19 @@
 
 import os
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock
-
 import guessit
 import pytest
+import sickbeard
+import sickbeard.name_parser.guessit_parser as sut
 from six import iteritems
-
 import yaml
 from yaml.constructor import ConstructorError
 from yaml.nodes import MappingNode, SequenceNode
 
-import sickbeard
-import sickbeard.name_parser.guessit_parser as sut
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 
 __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))

tests/test_subtitles.py

@@ -5,9 +5,8 @@
 
 from babelfish.language import Language
 from mock.mock import Mock
-from subliminal.subtitle import Subtitle
-
 import sickbeard.subtitles as sut
+from subliminal.subtitle import Subtitle
 
 
 def test_sorted_service_list(monkeypatch):