[CalendarServer-changes] [8266] CalendarServer/trunk/calendarserver/tools/shell.py

[source_changes at macosforge.org]

Revision: 8266
          http://trac.macosforge.org/projects/calendarserver/changeset/8266
Author:   wsanchez at apple.com
Date:     2011-11-08 16:38:25 -0800 (Tue, 08 Nov 2011)
Log Message:
-----------
info works

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/shell.py

Modified: CalendarServer/trunk/calendarserver/tools/shell.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell.py	2011-11-09 00:31:30 UTC (rev 8265)
+++ CalendarServer/trunk/calendarserver/tools/shell.py	2011-11-09 00:38:25 UTC (rev 8266)
@@ -295,8 +295,12 @@
             raise UnknownArguments(tokens)
             return
 
+        def write(description):
+            self.terminal.write(description)
+            self.terminal.nextLine()
+
         d = self.wd.describe()
-        d.addCallback(lambda x: sys.stdout.write(x))
+        d.addCallback(write)
         return d
 
     def cmd_exit(self, tokens):
@@ -328,7 +332,7 @@
         return "/" + "/".join(self.path)
 
     def describe(self):
-        return succeed(str(self))
+        return succeed("%s (%s)" % (self, self.__class__))
 
     def locate(self, path):
         #log.msg("locate(%r)" % (path,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111108/605ee0d3/attachment.html>