mirror of
https://github.com/morpheus65535/bazarr
synced 2025-02-01 03:43:04 +00:00
Removed some Python 2.7.x compatibility code.
This commit is contained in:
parent
d7333d9172
commit
e7d68f4316
1 changed files with 3 additions and 6 deletions
|
@ -1,20 +1,18 @@
|
|||
# coding=utf-8
|
||||
|
||||
from __future__ import absolute_import
|
||||
import io
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
import traceback
|
||||
from urllib import parse
|
||||
|
||||
import requests
|
||||
|
||||
import inflect
|
||||
import re
|
||||
import json
|
||||
import six.moves.urllib.parse
|
||||
|
||||
import sys
|
||||
import html
|
||||
|
||||
from zipfile import ZipFile
|
||||
|
@ -32,7 +30,6 @@ from subliminal_patch.subtitle import Subtitle, guess_matches
|
|||
from subliminal_patch.converters.subscene import language_ids, supported_languages
|
||||
from subscene_api.subscene import search, Subtitle as APISubtitle, SITE_DOMAIN
|
||||
from subzero.language import Language
|
||||
import six
|
||||
|
||||
p = inflect.engine()
|
||||
|
||||
|
@ -164,7 +161,7 @@ class SubsceneProvider(Provider, ProviderSubtitleArchiveMixin):
|
|||
if match:
|
||||
h = html
|
||||
data = json.loads(h.unescape(match.group(1)))
|
||||
login_url = six.moves.urllib.parse.urljoin(data["siteUrl"], data["loginUrl"])
|
||||
login_url = parse.urljoin(data["siteUrl"], data["loginUrl"])
|
||||
time.sleep(1.0)
|
||||
|
||||
r = self.session.post(login_url,
|
||||
|
@ -192,7 +189,7 @@ class SubsceneProvider(Provider, ProviderSubtitleArchiveMixin):
|
|||
else:
|
||||
cj = self.session.cookies.copy()
|
||||
store_cks = ("scene", "idsrv", "idsrv.xsrf", "idsvr.clients", "idsvr.session", "idsvr.username")
|
||||
for cn in six.iterkeys(self.session.cookies):
|
||||
for cn in self.session.cookies.keys():
|
||||
if cn not in store_cks:
|
||||
del cj[cn]
|
||||
|
||||
|
|
Loading…
Reference in a new issue