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

[source_changes at macosforge.org]

Revision: 8280
          http://trac.macosforge.org/projects/calendarserver/changeset/8280
Author:   wsanchez at apple.com
Date:     2011-11-11 12:58:14 -0800 (Fri, 11 Nov 2011)
Log Message:
-----------
describe() needs to return a str not a list

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

Modified: CalendarServer/trunk/calendarserver/tools/shell.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell.py	2011-11-11 20:12:45 UTC (rev 8279)
+++ CalendarServer/trunk/calendarserver/tools/shell.py	2011-11-11 20:58:14 UTC (rev 8280)
@@ -427,7 +427,7 @@
             if not home:
                 return fail(NotFoundError("No calendar home for UID %r" % (name,)))
 
-            return HomeDirectory(self.store, self.path + (name,), home)
+            return CalendarHomeDirectory(self.store, self.path + (name,), home)
 
         d = txn.calendarHomeWithUID(name)
         d.addCallback(gotHome)
@@ -440,7 +440,7 @@
         return d
 
 
-class HomeDirectory(Directory):
+class CalendarHomeDirectory(Directory):
     """
     Home directory.
     """
@@ -478,9 +478,11 @@
             for name in sorted(properties):
                 result.append("%s: %s" % (name, properties[name]))
 
-        returnValue(result)
+        returnValue("\n".join(result))
 
     def list(self):
+        calendars = self.home.calendars()
+        
         # FIXME
         return succeed(())
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111111/51373190/attachment.html>