[CalendarServer-changes] [7920] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/resource.py

[source_changes at macosforge.org]

Revision: 7920
          http://trac.macosforge.org/projects/calendarserver/changeset/7920
Author:   glyph at apple.com
Date:     2011-08-11 21:43:47 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
more idiomatic fillSlots usage

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:43:36 UTC (rev 7919)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:43:47 UTC (rev 7920)
@@ -111,21 +111,19 @@
         def searchPerformed(results):
             for idx, record in enumerate(results):
                 yield tag.clone().fillSlots(
-                    **{
-                        "rowClass": "even" if (idx % 2 == 0) else "odd",
-                        "type": record.recordType,
-                        "shortName": record.shortNames[0],
-                        "name": record.fullName,
-                        "typeStr": {
-                            "users"     : "User",
-                            "groups"    : "Group",
-                            "locations" : "Place",
-                            "resources" : "Resource",
-                        }.get(record.recordType),
-                        "shortNames": str(", ".join(record.shortNames)),
-                        "authIds": str(", ".join(record.authIDs)),
-                        "emails": str(", ".join(record.emailAddresses)),
-                    }
+                    rowClass="even" if (idx % 2 == 0) else "odd",
+                    type=record.recordType,
+                    shortName=record.shortNames[0],
+                    name= record.fullName,
+                    typeStr={
+                        "users"     : "User",
+                        "groups"    : "Group",
+                        "locations" : "Place",
+                        "resources" : "Resource",
+                    }.get(record.recordType),
+                    shortNames=str(", ".join(record.shortNames)),
+                    authIds=str(", ".join(record.authIDs)),
+                    emails=str(", ".join(record.emailAddresses)),
                 )
         return d.addCallback(searchPerformed)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/215e85ea/attachment.html>