wingo - in flumotion/trunk: . flumotion/twisted

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed Jan  3 13:39:33 2007
New Revision: 4373

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/twisted/pb.py
Log:
2007-01-03  Andy Wingo  <wingo at pobox.com>

	* flumotion/twisted/pb.py: Import common.
	(Avatar.mindCallRemote, Avatar.mindCallRemoteLogging.errback)
	(Avatar.mindCallRemoteLogging.callback)
	(Avatar.mindCallRemoteLogging): Floggulate.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jan  3 13:39:33 2007
@@ -1,5 +1,10 @@
 2007-01-03  Andy Wingo  <wingo at pobox.com>
 
+	* flumotion/twisted/pb.py: Import common.
+	(Avatar.mindCallRemote, Avatar.mindCallRemoteLogging.errback)
+	(Avatar.mindCallRemoteLogging.callback)
+	(Avatar.mindCallRemoteLogging): Floggulate.
+
 	* flumotion/common/medium.py (PingingMedium._ping): PONG
 
 	* flumotion/twisted/pb.py (Avatar.__init__, Avatar.setMind): Add

Modified: flumotion/trunk/flumotion/twisted/pb.py
==============================================================================
--- flumotion/trunk/flumotion/twisted/pb.py	(original)
+++ flumotion/trunk/flumotion/twisted/pb.py	Wed Jan  3 13:39:33 2007
@@ -35,7 +35,7 @@
 from twisted.spread.pb import PBClientFactory
 
 from flumotion.configure import configure
-from flumotion.common import keycards, interfaces
+from flumotion.common import keycards, interfaces, common
 from flumotion.common import log as flog
 from flumotion.twisted import reflect as freflect
 from flumotion.twisted import credentials as fcredentials
@@ -677,7 +677,7 @@
         if level is not None:
             debugClass = str(self.__class__).split(".")[-1].upper()
             startArgs = [self.remoteLogName, debugClass, name]
-            format, debugArgs = log.getFormatArgs(
+            format, debugArgs = flog.getFormatArgs(
                 '%s --> %s: callRemote(%s, ', startArgs,
                 ')', (), args, kwargs)
             logKwArgs = self.doLog(level, stackDepth - 1, format,
@@ -689,14 +689,14 @@
             return defer.fail(errors.NotConnectedError())
 
         def callback(result):
-            format, debugArgs = log.getFormatArgs(
+            format, debugArgs = flog.getFormatArgs(
                 '%s <-- %s: callRemote(%s, ', startArgs,
-                '): %r', (log.ellipsize(result), ), args, kwargs)
+                '): %r', (flog.ellipsize(result), ), args, kwargs)
             self.doLog(level, -1, format, *debugArgs, **logKwArgs)
             return result
 
         def errback(failure):
-            format, debugArgs = log.getFormatArgs(
+            format, debugArgs = flog.getFormatArgs(
                 '%s <-- %s: callRemote(%s', startArgs,
                 '): %r', (failure, ), args, kwargs)
             self.doLog(level, -1, format, *debugArgs, **logKwArgs)
@@ -714,7 +714,7 @@
         @param name: name of the remote method
         @type  name: str
         """
-        return self.mindCallRemoteLogging(log.DEBUG, -1, name, *args,
+        return self.mindCallRemoteLogging(flog.DEBUG, -1, name, *args,
                                           **kwargs)
 
     def disconnect(self):