Skip to content

Commit 5a65518

Browse files
Updating plugin to Python 3 from changes suggested by 2to3
1 parent d049ca9 commit 5a65518

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

defaulttrackers/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242

4343
class CorePlugin(PluginInitBase):
4444
def __init__(self, plugin_name):
45-
from core import Core as _plugin_cls
46-
self._plugin_cls = _plugin_cls
47-
super(CorePlugin, self).__init__(plugin_name)
45+
from .core import Core as _plugin_cls
46+
self._plugin_cls = _plugin_cls
47+
super(CorePlugin, self).__init__(plugin_name)
4848

4949
class GtkUIPlugin(PluginInitBase):
5050
def __init__(self, plugin_name):
51-
from gtkui import GtkUI as _plugin_cls
51+
from .gtkui import GtkUI as _plugin_cls
5252
self._plugin_cls = _plugin_cls
5353
super(GtkUIPlugin, self).__init__(plugin_name)
5454

5555
class WebUIPlugin(PluginInitBase):
5656
def __init__(self, plugin_name):
57-
from webui import WebUI as _plugin_cls
57+
from .webui import WebUI as _plugin_cls
5858
self._plugin_cls = _plugin_cls
5959
super(WebUIPlugin, self).__init__(plugin_name)

defaulttrackers/core.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import ssl
4545
import time
4646
import traceback
47-
import urllib2
47+
import urllib.request, urllib.error, urllib.parse
4848

4949
from deluge.common import is_url
5050
from deluge.core.rpcserver import export
@@ -94,12 +94,12 @@ def update_trackerlist_from_url(self):
9494
'Accept-Language': 'en-US,en;q=0.8',
9595
}
9696

97-
req = urllib2.Request(self.config["dynamic_trackerlist_url"], headers=headers)
97+
req = urllib.request.Request(self.config["dynamic_trackerlist_url"], headers=headers)
9898
try:
99-
page = urllib2.urlopen(req, context=ssl._create_unverified_context()).read()
99+
page = urllib.request.urlopen(req, context=ssl._create_unverified_context()).read()
100100
except:
101101
# maybe an older Python version without a "context" argument
102-
page = urllib2.urlopen(req).read()
102+
page = urllib.request.urlopen(req).read()
103103
new_trackers = [url for url in re.findall(r'\w+://[\w\-.:/]+', page) if is_url(url)]
104104
if new_trackers:
105105
# replace all existing trackers
@@ -133,7 +133,7 @@ def on_torrent_added(self, torrent_id, from_state=False):
133133
@export
134134
def set_config(self, config):
135135
"""Sets the config dictionary"""
136-
for key in config.keys():
136+
for key in list(config.keys()):
137137
self.config[key] = config[key]
138138
self.config.save()
139139

defaulttrackers/gtkui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from deluge.ui.gtkui import dialogs
4848
#from pprint import pprint
4949

50-
from common import get_resource
50+
from .common import get_resource
5151

5252
log = logging.getLogger(__name__)
5353

defaulttrackers/webui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from deluge import component
4444
from deluge.plugins.pluginbase import WebPluginBase
4545

46-
from common import get_resource
46+
from .common import get_resource
4747

4848
log = logging.getLogger(__name__)
4949

0 commit comments

Comments
 (0)