github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 05:13:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix imports for Python 3

Browse source
This commit is contained in:
Labrys of Knossos 2018-12-15 12:44:47 -05:00
commit d8f7c4eb7b
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libs/utorrent/client.py
View file

@ -1,10 +1,17 @@
# coding=utf8 # coding=utf8
import StringIO
import cookielib
import re import re
import urllib import urllib
import urllib2
import urlparse from six import StringIO
from six.moves.http_cookiejar import CookieJar
from six.moves.urllib.request import (
HTTPBasicAuthHandler,
HTTPCookieProcessor,
Request,
build_opener,
install_opener,
)
from six.moves.urllib_parse import urljoin
from .upload import MultiPartForm from .upload import MultiPartForm
@ -26,23 +33,23 @@ class UTorrentClient(object):
def _make_opener(self, realm, base_url, username, password): def _make_opener(self, realm, base_url, username, password):
'''uTorrent API need HTTP Basic Auth and cookie support for token verify.''' '''uTorrent API need HTTP Basic Auth and cookie support for token verify.'''
auth_handler = urllib2.HTTPBasicAuthHandler() auth_handler = HTTPBasicAuthHandler()
auth_handler.add_password(realm=realm, auth_handler.add_password(realm=realm,
uri=base_url, uri=base_url,
user=username, user=username,
passwd=password) passwd=password)
opener = urllib2.build_opener(auth_handler) opener = build_opener(auth_handler)
urllib2.install_opener(opener) install_opener(opener)
cookie_jar = cookielib.CookieJar() cookie_jar = CookieJar()
cookie_handler = urllib2.HTTPCookieProcessor(cookie_jar) cookie_handler = HTTPCookieProcessor(cookie_jar)
handlers = [auth_handler, cookie_handler] handlers = [auth_handler, cookie_handler]
opener = urllib2.build_opener(*handlers) opener = build_opener(*handlers)
return opener return opener
def _get_token(self): def _get_token(self):
url = urlparse.urljoin(self.base_url, 'token.html') url = urljoin(self.base_url, 'token.html')
response = self.opener.open(url) response = self.opener.open(url)
token_re = "<div id='token' style='display:none;'>([^<>]+)</div>" token_re = "<div id='token' style='display:none;'>([^<>]+)</div>"
match = re.search(token_re, response.read()) match = re.search(token_re, response.read())
@ -132,7 +139,7 @@ class UTorrentClient(object):
def _action(self, params, body=None, content_type=None): def _action(self, params, body=None, content_type=None):
#about token, see https://github.com/bittorrent/webui/wiki/TokenSystem #about token, see https://github.com/bittorrent/webui/wiki/TokenSystem
url = self.base_url + '?token=' + self.token + '&' + urllib.urlencode(params) url = self.base_url + '?token=' + self.token + '&' + urllib.urlencode(params)
request = urllib2.Request(url) request = Request(url)
if body: if body:
request.add_data(body) request.add_data(body)

4
libs/utorrent/upload.py
View file

@ -2,8 +2,8 @@
# code copied from http://www.doughellmann.com/PyMOTW/urllib2/ # code copied from http://www.doughellmann.com/PyMOTW/urllib2/
import itertools import itertools
import mimetools
import mimetypes import mimetypes
from email.generator import _make_boundary as choose_boundary
class MultiPartForm(object): class MultiPartForm(object):
@ -12,7 +12,7 @@ class MultiPartForm(object):
def __init__(self): def __init__(self):
self.form_fields = [] self.form_fields = []
self.files = [] self.files = []
self.boundary = mimetools.choose_boundary() self.boundary = choose_boundary()
return return
def get_content_type(self): def get_content_type(self):