Author: damoxc
Revision: 4922
Log:
fix __init__ to stop gtk being imported in the core
Diff:
Modified: trunk/deluge/plugins/execute/execute/__init__.py
===================================================================
--- trunk/deluge/plugins/execute/execute/__init__.py 2009-03-23 19:20:45 UTC
(rev 4921)
+++ trunk/deluge/plugins/execute/execute/__init__.py 2009-03-23 20:58:21 UTC
(rev 4922)
@@ -25,10 +25,19 @@
from deluge.plugins.init import PluginInitBase
class CorePlugin(PluginInitBase):
- from core import Core as _plugin_cls
+ def __init__(self, plugin_name):
+ from core import Core as _plugin_cls
+ self._plugin_cls = _plugin_cls
+ super(CorePlugin, self).__init__(plugin_name)
class GtkUIPlugin(PluginInitBase):
- from gtkui import GtkUI as _plugin_cls
+ def __init__(self, plugin_name):
+ from gtkui import GtkUI as _plugin_cls
+ self._plugin_cls = _plugin_cls
+ super(GtkUIPlugin, self).__init__(plugin_name)
class WebUIPlugin(PluginInitBase):
- from webui import WebUI as _plugin_cls
+ def __init__(self, plugin_name):
+ from webui import WebUI as _plugin_cls
+ self._plugin_cls = _plugin_cls
+ super(WebUIPlugin, self).__init__(plugin_name)
\ No newline at end of file
Modified: trunk/deluge/plugins/execute/execute/gtkui.py
===================================================================
--- trunk/deluge/plugins/execute/execute/gtkui.py 2009-03-23 19:20:45 UTC
(rev 4921)
+++ trunk/deluge/plugins/execute/execute/gtkui.py 2009-03-23 20:58:21 UTC
(rev 4922)
@@ -23,6 +23,7 @@
#
import os
+import gtk
import pkg_resources
from deluge.log import LOG as log
@@ -31,8 +32,6 @@
import deluge.component as component
import deluge.common
-gtk = None
-
EXECUTE_ID = 0
EXECUTE_EVENT = 1
EXECUTE_COMMAND = 2
@@ -47,8 +46,6 @@
class ExecutePreferences(object):
def __init__(self, plugin):
self.plugin = plugin
- global gtk
- import gtk
def load(self):
log.debug("Adding Execute Preferences page")
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
