diff options
| author | panni <[email protected]> | 2018-10-31 17:33:19 +0100 |
|---|---|---|
| committer | panni <[email protected]> | 2018-10-31 17:33:19 +0100 |
| commit | d8c6570b4962ad5f9d5be1fa57b07d74f1ccc9de (patch) | |
| tree | 12510965daa10e9d8c3e0803330fa059e2f45456 | |
| parent | 8f584143f8afc46a75a83dab5243739772e3562b (diff) | |
| download | bazarr-d8c6570b4962ad5f9d5be1fa57b07d74f1ccc9de.tar.gz bazarr-d8c6570b4962ad5f9d5be1fa57b07d74f1ccc9de.zip | |
first non-boot-failing version
| -rw-r--r-- | bazarr/get_providers.py | 3 | ||||
| -rw-r--r-- | bazarr/get_subtitle.py | 7 | ||||
| -rw-r--r-- | bazarr/list_subtitles.py | 3 | ||||
| -rw-r--r-- | libs/subliminal_patch/http.py | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/bazarr/get_providers.py b/bazarr/get_providers.py index a6064f52e..92ab7c568 100644 --- a/bazarr/get_providers.py +++ b/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 import provider_manager +from subliminal_patch.extensions import provider_registry as provider_manager import collections def load_providers(): diff --git a/bazarr/get_subtitle.py b/bazarr/get_subtitle.py index 44fe32beb..e56b8776b 100644 --- a/bazarr/get_subtitle.py +++ b/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_patch 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.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 diff --git a/bazarr/list_subtitles.py b/bazarr/list_subtitles.py index 1bfe27d2f..fc27f9689 100644 --- a/bazarr/list_subtitles.py +++ b/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 diff --git a/libs/subliminal_patch/http.py b/libs/subliminal_patch/http.py index 5b6b308af..d7d1310ff 100644 --- a/libs/subliminal_patch/http.py +++ b/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: |