From b72c1c6c1b479c300ea7f176609f8f133eaedd56 Mon Sep 17 00:00:00 2001
From: Rato <rato.aq2@gmail.com>
Date: Fri, 5 Aug 2016 22:19:12 +0200
Subject: [PATCH] Fixing import order

---
 sickbeard/name_parser/guessit_parser.py       |  4 +---
 sickbeard/providers/torrent/html/freshontv.py |  4 +---
 sickbeard/subtitles.py                        | 10 ++++------
 sickbeard/tv.py                               |  6 +-----
 tests/test_guessit.py                         | 14 ++++++--------
 tests/test_subtitles.py                       |  3 +--
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/sickbeard/name_parser/guessit_parser.py b/sickbeard/name_parser/guessit_parser.py
index 3bb40d6aaf..036a7827d9 100644
--- a/sickbeard/name_parser/guessit_parser.py
+++ b/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 = {
diff --git a/sickbeard/providers/torrent/html/freshontv.py b/sickbeard/providers/torrent/html/freshontv.py
index 4aebf1dca9..d88bc961ef 100644
--- a/sickbeard/providers/torrent/html/freshontv.py
+++ b/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
diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py
index bcd01db794..7a9de0d076 100644
--- a/sickbeard/subtitles.py
+++ b/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
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 8734c32a22..3e908a54db 100644
--- a/sickbeard/tv.py
+++ b/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:
diff --git a/tests/test_guessit.py b/tests/test_guessit.py
index 8bb6579bc9..880c282cea 100644
--- a/tests/test_guessit.py
+++ b/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__)))
diff --git a/tests/test_subtitles.py b/tests/test_subtitles.py
index 32b8cc443c..c90b905f7d 100644
--- a/tests/test_subtitles.py
+++ b/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):