[CalendarServer-changes] [5355] CalendarServer/trunk/twistedcaldav/extensions.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 19 11:05:29 PDT 2010


Revision: 5355
          http://trac.macosforge.org/projects/calendarserver/changeset/5355
Author:   wsanchez at apple.com
Date:     2010-03-19 11:05:29 -0700 (Fri, 19 Mar 2010)
Log Message:
-----------
SudoSACLMixin -> SudoersMixin.  Don't export this.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/extensions.py

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2010-03-19 17:42:24 UTC (rev 5354)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2010-03-19 18:05:29 UTC (rev 5355)
@@ -20,7 +20,6 @@
 """
 
 __all__ = [
-    "SudoSACLMixin",
     "DAVResource",
     "DAVPrincipalResource",
     "DAVFile",
@@ -82,7 +81,7 @@
     )
 
 
-class SudoSACLMixin (object):
+class SudoersMixin (object):
     """
     Mixin class to let DAVResource, and DAVFile subclasses know about
     sudoer principals and how to find their AuthID.
@@ -187,7 +186,7 @@
         Check for sudo users before regular users.
         """
         if type(creds) is str:
-            return super(SudoSACLMixin, self).findPrincipalForAuthID(creds)
+            return super(SudoersMixin, self).findPrincipalForAuthID(creds)
 
         for collection in self.principalCollections():
             principal = collection.principalForShortName(
@@ -270,7 +269,7 @@
             raise HTTPError(responsecode.FORBIDDEN)
         else:
             # No proxy - do default behavior
-            result = (yield super(SudoSACLMixin, self).authorizationPrincipal(request, authID, authnPrincipal))
+            result = (yield super(SudoersMixin, self).authorizationPrincipal(request, authID, authnPrincipal))
             returnValue(result)
 
 
@@ -444,7 +443,7 @@
         returnValue(MultiStatusResponse(responses))
 
 
-class DAVResource (DirectoryPrincipalPropertySearchMixIn, SudoSACLMixin, SuperDAVResource, LoggingMixIn):
+class DAVResource (DirectoryPrincipalPropertySearchMixIn, SudoersMixin, SuperDAVResource, LoggingMixIn):
     """
     Extended L{twext.web2.dav.resource.DAVResource} implementation.
     """
@@ -708,7 +707,7 @@
             return davxml.ResourceType(davxml.Principal())
 
 
-class DAVFile (SudoSACLMixin, SuperDAVFile, LoggingMixIn):
+class DAVFile (SudoersMixin, SuperDAVFile, LoggingMixIn):
     """
     Extended L{twext.web2.dav.static.DAVFile} implementation.
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100319/13ebd288/attachment-0001.html>


More information about the calendarserver-changes mailing list