msmith - in flumotion/trunk: . flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed Jul 18 17:56:10 2007
New Revision: 5326

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/manager/component.py
   flumotion/trunk/flumotion/manager/depgraph.py
Log:
        * flumotion/manager/component.py:
          Import twisted.internet.error as terror, use terror where there's a
          local function called error.

        * flumotion/manager/depgraph.py:
          Add a comment.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jul 18 17:56:10 2007
@@ -1,5 +1,14 @@
 2007-07-18  Michael Smith <msmith at fluendo.com>
 
+	* flumotion/manager/component.py:
+	  Import twisted.internet.error as terror, use terror where there's a
+	  local function called error.
+
+	* flumotion/manager/depgraph.py:
+	  Add a comment.
+
+2007-07-18  Michael Smith <msmith at fluendo.com>
+
 	* flumotion/manager/depgraph.py:
 	  Add some comments, simplify a bit of code.
 

Modified: flumotion/trunk/flumotion/manager/component.py
==============================================================================
--- flumotion/trunk/flumotion/manager/component.py	(original)
+++ flumotion/trunk/flumotion/manager/component.py	Wed Jul 18 17:56:10 2007
@@ -29,7 +29,8 @@
 import time
 
 from twisted.spread import pb
-from twisted.internet import reactor, defer, error
+from twisted.internet import reactor, defer
+from twisted.internet import error as terror
 from twisted.python.failure import Failure
 from zope.interface import implements
 
@@ -729,8 +730,8 @@
             host = '127.0.0.1'
 
         def errback(failure):
-            failure.trap(error.ConnectError,
-                         error.ConnectionRefusedError)
+            failure.trap(terror.ConnectError,
+                         terror.ConnectionRefusedError)
             return error(N_("Could not connect component to %s:%d for "
                             "feed %s."), host, port, fullFeedId,
                          debug="No component '%s'." % componentId)
@@ -806,8 +807,8 @@
         port = eaterAvatar.getFeedServerPort()
 
         def errback(failure):
-            failure.trap(error.ConnectError,
-                         error.ConnectionRefusedError)
+            failure.trap(terror.ConnectError,
+                         terror.ConnectionRefusedError)
             return error(N_("Could not connect component to %s:%d for "
                             "feed %s."), host, port, fullFeedId,
                          debug="No component '%s'." % componentId)

Modified: flumotion/trunk/flumotion/manager/depgraph.py
==============================================================================
--- flumotion/trunk/flumotion/manager/depgraph.py	(original)
+++ flumotion/trunk/flumotion/manager/depgraph.py	Wed Jul 18 17:56:10 2007
@@ -176,6 +176,9 @@
             raise KeyError("Worker %s or Component %r not in dependency graph" %
                 (worker, component))
 
+    # TODO: This is nasty: it goes and touches anything in the graph, not just
+    # the newly added things. Unfortunately, we don't enforce adding things in
+    # the right order, so doing it correctly otherwise looks hard.
     def mapEatersToFeeders(self):
         """
         I am called once a piece of configuration has been added,