Skip to content

Commit dfbe955

Browse files
committed
add requests module dependency
1 parent faa3c91 commit dfbe955

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

addon.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<requires>
44
<import addon="xbmc.python" version="2.1.0"/>
55
<import addon="script.module.six" version="1.9.0"/>
6+
<import addon="script.module.requests" version="2.9.1"/>
67
</requires>
78
<extension point="xbmc.python.module" library="resources/lib"/>
89
<extension point="xbmc.addon.metadata">

resources/lib/twitch/scraper.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- encoding: utf-8 -*-
2-
import six
2+
import requests
3+
# import six
34
from six.moves.urllib.error import URLError
45
from six.moves.urllib.parse import quote_plus # NOQA
56
from six.moves.urllib.parse import urlencode
6-
from six.moves.urllib.request import Request, urlopen
7+
# from six.moves.urllib.request import Request, urlopen
78

89
from twitch.keys import USER_AGENT, USER_AGENT_STRING
910
from twitch.logging import log
@@ -41,14 +42,9 @@ def download(baseurl, parameters={}, headers={}):
4142
data = ""
4243
for _ in range(MAX_RETRIES):
4344
try:
44-
req = Request(url, headers=headers)
45-
req.add_header(USER_AGENT, USER_AGENT_STRING)
46-
response = urlopen(req)
47-
if six.PY2:
48-
data = response.read()
49-
else:
50-
data = response.read().decode('utf-8')
51-
response.close()
45+
headers.update({USER_AGENT: USER_AGENT_STRING})
46+
response = requests.get(url, headers=headers)
47+
data = response.content
5248
break
5349
except Exception as err:
5450
if not isinstance(err, URLError):

0 commit comments

Comments
 (0)