first non-boot-failing version

bazarr/get_providers.py

@@ -2,8 +2,7 @@ from get_argv import config_dir
 
 import sqlite3
 import os
-from subliminal import provider_manager
+from subliminal_patch.extensions import provider_registry as provider_manager
-from subliminal_patch import provider_manager
 import collections
 
 def load_providers():

bazarr/get_subtitle.py

@@ -7,12 +7,13 @@ import logging
 import operator
 import subprocess
 import time
+import subliminal
+import subliminal_patch
 from datetime import datetime, timedelta
 from babelfish import Language
-from subliminal import region, scan_video, Video, download_best_subtitles, compute_score, save_subtitles, AsyncProviderPool, score, list_subtitles, download_subtitles
+from subliminal import region, scan_video, Video, download_best_subtitles, compute_score, save_subtitles, score, list_subtitles, download_subtitles
-from subliminal_patch import region, scan_video, Video, download_best_subtitles, compute_score, save_subtitles, AsyncProviderPool, score, list_subtitles, download_subtitles
+from subliminal_patch.core import SZAsyncProviderPool as AsyncProviderPool
 from subliminal.subtitle import get_subtitle_path
-from subliminal_patch.subtitle import get_subtitle_path
 from get_languages import language_from_alpha3, alpha2_from_alpha3, alpha3_from_alpha2
 from bs4 import UnicodeDammit
 from get_settings import get_general_settings, pp_replace, path_replace, path_replace_movie, path_replace_reverse, path_replace_reverse_movie

bazarr/list_subtitles.py

@@ -5,8 +5,9 @@ import os
 import enzyme
 import babelfish
 import logging
+import subliminal
+import subliminal_patch
 from subliminal import core
-from subliminal_patch import core
 import sqlite3
 import ast
 import langdetect

libs/subliminal_patch/http.py

@@ -16,7 +16,9 @@ from exceptions import APIThrottled
 from subzero.lib.io import get_viable_encoding
 
 logger = logging.getLogger(__name__)
-pem_file = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(unicode(__file__, get_viable_encoding()))), "..", certifi.where()))
+pem_file = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(unicode(__file__, get_viable_encoding()))),
+                                         "..", "..", certifi.where()))
+
 try:
     default_ssl_context = ssl.create_default_context(cafile=pem_file)
 except AttributeError: