Subliminal update

libs/subliminal/__init__.py

@@ -18,14 +18,6 @@
 # You should have received a copy of the Lesser GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+__all__ = ['Subliminal']
 
-
-from infos import *
-from languages import *
-from utils import *
-from exceptions import *
-from videos import *
-from tasks import *
-from subtitles import *
-from core import *
-from plugins import *
+from core import Subliminal

libs/subliminal/core.py

@@ -27,7 +27,7 @@ from exceptions import InvalidLanguageError, PluginError, BadStateError, \
     WrongTaskError, DownloadFailedError
 from itertools import groupby
 from languages import list_languages
-from subliminal.utils import NullHandler
+from utils import NullHandler
 from tasks import Task, DownloadTask, ListTask, StopTask
 import Queue
 import guessit
@@ -216,16 +216,16 @@ class Subliminal(object):
         key = ''
         for sort_item in order:
             if sort_item == LANGUAGE_INDEX:
-                key += '{:03d}'.format(len(self._languages) - self._languages.index(subtitle.language) - 1)
+                key += '{0:03d}'.format(len(self._languages) - self._languages.index(subtitle.language) - 1)
             elif sort_item == PLUGIN_INDEX:
-                key += '{:02d}'.format(len(self._plugins) - self._plugins.index(subtitle.plugin) - 1)
+                key += '{0:02d}'.format(len(self._plugins) - self._plugins.index(subtitle.plugin) - 1)
             elif sort_item == PLUGIN_CONFIDENCE:
-                key += '{:04d}'.format(int(subtitle.confidence * 1000))
+                key += '{0:04d}'.format(int(subtitle.confidence * 1000))
             elif sort_item == MATCHING_CONFIDENCE:
                 confidence = 0
                 if subtitle.release:
                     confidence = matching_confidence(video, subtitle)
-                key += '{:04d}'.format(int(confidence * 1000))
+                key += '{0:04d}'.format(int(confidence * 1000))
         return int(key)
 
     def groupByVideo(self, list_result):

libs/subliminal/plugins.py

@@ -22,8 +22,8 @@ __all__ = ['PluginBase', 'OpenSubtitles', 'BierDopje', 'TheSubDB', 'SubsWiki', '
 
 
 from exceptions import DownloadFailedError, MissingLanguageError, PluginError
-from subliminal.utils import get_keywords, PluginConfig, split_keyword
-from subliminal.videos import Episode, Movie, UnknownVideo
+from utils import get_keywords, PluginConfig, split_keyword
+from videos import Episode, Movie, UnknownVideo
 from subtitles import ResultSubtitle, get_subtitle_path
 import BeautifulSoup
 import abc

libs/subliminal/subtitles.py

@@ -21,7 +21,7 @@
 __all__ = ['Subtitle', 'EmbeddedSubtitle', 'ExternalSubtitle', 'ResultSubtitle', 'get_subtitle_path']
 
 
-from subliminal.languages import list_languages, convert_language
+from languages import list_languages, convert_language
 import abc
 import os.path