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

[source_changes at macosforge.org]

Revision: 8988
          http://trac.macosforge.org/projects/calendarserver/changeset/8988
Author:   wsanchez at apple.com
Date:     2012-04-05 12:49:45 -0700 (Thu, 05 Apr 2012)
Log Message:
-----------
Clean up symbols

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

Modified: CalendarServer/trunk/calendarserver/tools/shell/vfs.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-04-05 19:45:12 UTC (rev 8987)
+++ CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-04-05 19:49:45 UTC (rev 8988)
@@ -340,8 +340,8 @@
 
     @inlineCallbacks
     def describe(self):
-        result = []
-        result.append("Principal home for UID: %s\n" % (self.uid,))
+        description = []
+        description.append("Principal home for UID: %s\n" % (self.uid,))
 
         if self.record is not None:
             #
@@ -378,8 +378,8 @@
             add("Enabled for Contacts", self.record.enabledForAddressBooks)
 
             if rows:
-                result.append("Directory Record:")
-                result.append(tableString(rows))
+                description.append("Directory Record:")
+                description.append(tableString(rows))
 
             #
             # Group memberships
@@ -392,8 +392,8 @@
             if rows:
                 def sortKey(row):
                     return (row[1], row[2])
-                result.append("Group Memberships:")
-                result.append(tableString(
+                description.append("Group Memberships:")
+                description.append(tableString(
                     sorted(rows, key=sortKey),
                     header=("UID", "Short Name", "Full Name")
                 ))
@@ -430,13 +430,13 @@
             if rows:
                 def sortKey(row):
                     return (row[1], row[2], row[4])
-                result.append("Proxy Access:")
-                result.append(tableString(
+                description.append("Proxy Access:")
+                description.append(tableString(
                     sorted(rows, key=sortKey),
                     header=("UID", "Record Type", "Short Name", "Full Name", "Access")
                 ))
 
-        returnValue("\n".join(result))
+        returnValue("\n".join(description))
 
 
 class CalendarHomeFolder(Folder):
@@ -463,7 +463,7 @@
 
     @inlineCallbacks
     def describe(self):
-        result = ["Calendar home:\n"]
+        description = ["Calendar home:\n"]
 
         #
         # Attributes
@@ -486,21 +486,21 @@
             ))
 
         if len(rows):
-            result.append("Attributes:")
-            result.append(tableString(rows))
+            description.append("Attributes:")
+            description.append(tableString(rows))
 
         #
         # Properties
         #
         properties = (yield self.home.properties())
         if properties:
-            result.append("Properties:")
-            result.append(tableString((
+            description.append("Properties:")
+            description.append(tableString((
                 (name.toString(), truncateAtNewline(properties[name]))
                 for name in sorted(properties)
             )))
 
-        returnValue("\n".join(result))
+        returnValue("\n".join(description))
 
 
 class CalendarFolder(Folder):
@@ -637,8 +637,8 @@
         #
         properties = (yield self.object.properties())
         if properties:
-            result.append("Properties:")
-            result.append(tableString((
+            description.append("Properties:")
+            description.append(tableString((
                 (name.toString(), properties[name])
                 for name in sorted(properties)
             )))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120405/ad7baa3c/attachment.html>