[conduit/config-unstable] Remove references to configure



commit 579fef180de5fcc9db34fc64d3935f58f1abcf49
Author: John Stowers <john stowers gmail com>
Date:   Tue May 19 23:09:55 2009 +1200

    Remove references to configure
    
    All configuration should now be done through the new
    configuration system
---
 conduit/ModuleWrapper.py |    3 ---
 conduit/gtkui/Canvas.py  |   18 +++++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/conduit/ModuleWrapper.py b/conduit/ModuleWrapper.py
index a93ac43..a705bc4 100644
--- a/conduit/ModuleWrapper.py
+++ b/conduit/ModuleWrapper.py
@@ -251,9 +251,6 @@ class ModuleWrapper:
     def get_configuration_xml(self):
         return self.module.get_configuration_xml()
 
-    def configure(self, window):
-        self.module.configure(window)
-        
     def instantiate_module(self):
         self.module = self.klass(*self.initargs)
         
diff --git a/conduit/gtkui/Canvas.py b/conduit/gtkui/Canvas.py
index 190bcc8..8df723f 100644
--- a/conduit/gtkui/Canvas.py
+++ b/conduit/gtkui/Canvas.py
@@ -660,17 +660,13 @@ class Canvas(goocanvas.Canvas, _StyleMixin):
         dp = dpw.module
         conduitCanvasItem = self.selectedDataproviderItem.get_parent()
 
-        if hasattr(dp, "configure"):
-            log.critical("%s using old configuration system" % dpw.get_name())
-            dp.configure(self.parentWindow)
-        else:
-            config_container = dp.get_config_container(
-                                configContainerKlass=ConfigContainer.ConfigContainer,
-                                name=dpw.get_name(),
-                                icon=dpw.get_icon(),
-                                configurator=self.configurator
-            )
-            self.configurator.run(config_container)
+        config_container = dp.get_config_container(
+                            configContainerKlass=ConfigContainer.ConfigContainer,
+                            name=dpw.get_name(),
+                            icon=dpw.get_icon(),
+                            configurator=self.configurator
+        )
+        self.configurator.run(config_container)
 
         self._check_if_dataprovider_needs_configuration(
                 conduitCanvasItem.model,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]