[CalendarServer-changes] [13064] CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Mar 31 14:23:55 PDT 2014


Revision: 13064
          http://trac.calendarserver.org//changeset/13064
Author:   wsanchez at apple.com
Date:     2014-03-31 14:23:55 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
lint

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py	2014-03-31 20:41:45 UTC (rev 13063)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py	2014-03-31 21:23:55 UTC (rev 13064)
@@ -218,7 +218,8 @@
 @inlineCallbacks
 def getWikiACL(resource, request):
     """
-    Ask the wiki server we're paired with what level of access the authnUser has.
+    Ask the wiki server we're paired with what level of access the authnUser
+    has.
 
     Returns an ACL.
 
@@ -265,15 +266,17 @@
                         davxml.Privilege(davxml.Read()),
                         davxml.Privilege(davxml.ReadCurrentUserPrivilegeSet()),
 
-                        # We allow write-properties so that direct sharees can change
-                        # e.g. calendar color properties
+                        # We allow write-properties so that direct sharees can
+                        # change e.g. calendar color properties
                         davxml.Privilege(davxml.WriteProperties()),
                     ),
                     TwistedACLInheritable(),
                 ),
                 davxml.ACE(
                     davxml.Principal(
-                        davxml.HRef.fromString("/principals/wikis/%s/" % (wikiID,))
+                        davxml.HRef.fromString(
+                            "/principals/wikis/{}/".format(wikiID)
+                        )
                     ),
                     davxml.Grant(
                         davxml.Privilege(davxml.Read()),
@@ -297,7 +300,9 @@
                 ),
                 davxml.ACE(
                     davxml.Principal(
-                        davxml.HRef.fromString("/principals/wikis/%s/" % (wikiID,))
+                        davxml.HRef.fromString(
+                            "/principals/wikis/{}/".format(wikiID)
+                        )
                     ),
                     davxml.Grant(
                         davxml.Privilege(davxml.Read()),
@@ -330,6 +335,8 @@
         # pass through the HTTPError we might have raised above
         raise
 
-    except Exception, e:
-        log.error("Wiki ACL lookup failed: %s" % (e,))
-        raise HTTPError(StatusResponse(responsecode.SERVICE_UNAVAILABLE, "Wiki ACL lookup failed"))
+    except Exception as e:
+        log.error("Wiki ACL lookup failed: {error}", error=e)
+        raise HTTPError(StatusResponse(
+            responsecode.SERVICE_UNAVAILABLE, "Wiki ACL lookup failed"
+        ))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140331/6c6b76f0/attachment.html>


More information about the calendarserver-changes mailing list