Skip to content

Commit 7b31016

Browse files
replace 'requests' with 'urllib2'
1 parent 7fc5585 commit 7b31016

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

defaulttrackers/core.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
import datetime
4242
import logging
4343
import re
44+
import ssl
4445
import time
4546
import traceback
47+
import urllib2
4648

4749
from deluge.common import is_url
4850
from deluge.core.rpcserver import export
@@ -80,12 +82,24 @@ def update(self):
8082
@export
8183
def update_trackerlist_from_url(self):
8284
if self.config["dynamic_trackerlist_url"]:
83-
import requests # hide the import here in an attempt to lower the number of bug reports from people not having "python-requests" installed
8485
now = datetime.datetime.utcnow()
8586
last_update = datetime.datetime.utcfromtimestamp(self.config["last_dynamic_trackers_update"])
8687
if now - last_update > datetime.timedelta(days=self.config["dynamic_trackers_update_interval"]):
8788
try:
88-
page = requests.get(self.config["dynamic_trackerlist_url"]).text
89+
headers = {
90+
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0',
91+
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
92+
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
93+
'Accept-Encoding': 'none',
94+
'Accept-Language': 'en-US,en;q=0.8',
95+
}
96+
97+
req = urllib2.Request(self.config["dynamic_trackerlist_url"], headers=headers)
98+
try:
99+
page = urllib2.urlopen(req, context=ssl._create_unverified_context()).read()
100+
except:
101+
# maybe an older Python version without a "context" argument
102+
page = urllib2.urlopen(req).read()
89103
new_trackers = [url for url in re.findall(r'\w+://[\w\-.:/]+', page) if is_url(url)]
90104
if new_trackers:
91105
# replace all existing trackers

egg/DefaultTrackers-0.1-py2.7.egg

391 Bytes
Binary file not shown.

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
packages=[__plugin_name__.lower()],
7373
package_data = __pkg_data__,
7474
install_requires=[
75-
'requests',
7675
],
7776

7877
entry_points="""

0 commit comments

Comments
 (0)