support Deluge 2.0 and Python3

- bump version to 0.2

Author: stefantalpalaru

README.md

@@ -10,6 +10,8 @@ supposed to reach public trackers.
 
 Besides manually creating the default tracker list, you can also load it (periodically) from a URL.
 
+This plugin is compatible with Deluge 1.3 and 2.0, Python2 2.7 and Python3 3.5+.
+
 ## Installation
 
 * create the egg with
@@ -18,6 +20,8 @@ Besides manually creating the default tracker list, you can also load it (period
 
 (or try to use [the one from the "egg" directory][2] - be careful to install the py2.7 version of Deluge, if you're using Windows)
 
+* you need to use the same version of Python as the one that Deluge is running under.
+
 * add it to Deluge from Preferences -> Plugins -> Install Plugin
 
 ## Troubleshooting

defaulttrackers/__init__.py

@@ -1,7 +1,7 @@
 #
 # __init__.py
 #
-# Copyright (C) 2013-2016 Stefan Talpalaru <[email protected]>
+# Copyright (C) 2013-2019 Stefan Talpalaru <[email protected]>
 #
 # Basic plugin template created by:
 # Copyright (C) 2008 Martijn Voncken <[email protected]>
@@ -38,22 +38,30 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
+from __future__ import absolute_import
 from deluge.plugins.init import PluginInitBase
 
 class CorePlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from core import Core as _plugin_cls
+        from .core import Core as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(CorePlugin, self).__init__(plugin_name)
 
 class GtkUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from gtkui import GtkUI as _plugin_cls
+        from .gtkui import GtkUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(GtkUIPlugin, self).__init__(plugin_name)
 
+class Gtk3UIPlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .gtk3ui import Gtk3UI as _plugin_cls
+        self._plugin_cls = _plugin_cls
+        super(Gtk3UIPlugin, self).__init__(plugin_name)
+
 class WebUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from webui import WebUI as _plugin_cls
+        from .webui import WebUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(WebUIPlugin, self).__init__(plugin_name)
+

defaulttrackers/common.py

@@ -1,7 +1,7 @@
 #
 # common.py
 #
-# Copyright (C) 2013-2016 Stefan Talpalaru <[email protected]>
+# Copyright (C) 2013-2019 Stefan Talpalaru <[email protected]>
 #
 # Basic plugin template created by:
 # Copyright (C) 2008 Martijn Voncken <[email protected]>
@@ -39,6 +39,8 @@
 #
 
 
+from __future__ import absolute_import, unicode_literals
+
 def get_resource(filename):
     import pkg_resources, os
     return pkg_resources.resource_filename("defaulttrackers",

defaulttrackers/core.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # core.py
 #
-# Copyright (C) 2013-2018 Ștefan Talpalaru <[email protected]>
+# Copyright (C) 2013-2019 Ștefan Talpalaru <[email protected]>
 #
 # Basic plugin template created by:
 # Copyright (C) 2008 Martijn Voncken <[email protected]>
@@ -38,13 +38,14 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
+from __future__ import absolute_import, unicode_literals
 import datetime
 import logging
 import re
 import ssl
 import time
 import traceback
-import urllib2
+import six
 
 from deluge.common import is_url
 from deluge.core.rpcserver import export
@@ -94,13 +95,13 @@ def update_trackerlist_from_url(self):
                             'Accept-Language': 'en-US,en;q=0.8',
                             }
 
-                    req = urllib2.Request(self.config["dynamic_trackerlist_url"], headers=headers)
+                    req = six.moves.urllib.request.Request(self.config["dynamic_trackerlist_url"], headers=headers)
                     try:
-                        page = urllib2.urlopen(req, context=ssl._create_unverified_context()).read()
+                        page = six.moves.urllib.request.urlopen(req, context=ssl._create_unverified_context()).read()
                     except:
                         # maybe an older Python version without a "context" argument
-                        page = urllib2.urlopen(req).read()
-                    new_trackers = [url for url in re.findall(r'\w+://[\w\-.:/]+', page) if is_url(url)]
+                        page = six.moves.urllib.request.urlopen(req).read()
+                    new_trackers = [six.ensure_str(url) for url in re.findall(b'\w+://[\w\-.:/]+', page) if is_url(six.ensure_text(url))]
                     if new_trackers:
                         # replace all existing trackers
                         self.config["trackers"] = []