[CalendarServer-changes] [14802] CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/ gettrash.py

[source_changes at macosforge.org]

Revision: 14802
          http://trac.calendarserver.org//changeset/14802
Author:   sagen at apple.com
Date:     2015-05-19 13:05:17 -0700 (Tue, 19 May 2015)
Log Message:
-----------
Fix gettrash to render trashed collections properly, and show recoveryIDs

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/gettrash.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/gettrash.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/gettrash.py	2015-05-19 17:18:02 UTC (rev 14801)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/gettrash.py	2015-05-19 20:05:17 UTC (rev 14802)
@@ -43,7 +43,7 @@
             print
             print "Trashed Calendar Collections:"
             for calendar in jresult["trashedcollections"]:
-                print "  Name: {0.displayName}  - trashed: {0.whenTrashed} - children: {1}".format(calendar, len(calendar["children"]),)
+                print "  Name: {}  - trashed: {} - children: {} - RecoveryID: {}".format(calendar["displayName"], calendar["whenTrashed"], len(calendar["children"]), calendar["recoveryID"],)
 
         if "untrashedcollections" in jresult and jresult["untrashedcollections"]:
             print
@@ -52,7 +52,7 @@
                 print
                 print "  Calendar Collection: {} - children: {}".format(calendar["displayName"], len(calendar["children"]))
                 for child in calendar["children"]:
-                    print "    Title: {} - Start: {} - Trashed: {}".format(child["summary"], child["starttime"], child["whenTrashed"])
+                    print "    Title: {} - Start: {} - Trashed: {} - RecoveryID: {}".format(child["summary"], child["starttime"], child["whenTrashed"], child["recoveryID"])
 
         return True
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150519/7b13976c/attachment.html>