Permalink
Browse files

Update to Twisted 18155.

twisted.web2.dav.acl is gone.

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk@135 e27351fd-9f3e-4f54-a53b-843176b1656c
  • Loading branch information...
1 parent a21adcc commit 6859c4a963e73a5927232a35bfcc65e20a31d8a0 @wsanchez wsanchez committed Sep 15, 2006
Showing with 4 additions and 4 deletions.
  1. +1 −1 run
  2. +1 −1 twistedcaldav/repository.py
  3. +1 −1 twistedcaldav/resource.py
  4. +1 −1 twistedcaldav/static.py
View
2 run
@@ -412,7 +412,7 @@ if ! "${disable_setup}"; then
svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
fi;
- svn_get "Twisted" "${twisted}" "${svn_uri}" 18092;
+ svn_get "Twisted" "${twisted}" "${svn_uri}" 18155;
fi;
py_install "Twisted" "${twisted}";
@@ -25,7 +25,7 @@
from twisted.python import log
from twisted.python.filepath import FilePath
from twisted.web2.dav import davxml
-from twisted.web2.dav.acl import TwistedPasswordProperty
+from twisted.web2.dav.auth import TwistedPasswordProperty
from twisted.web2.dav.element.base import PCDATAElement
from twisted.web2.dav.element.parser import lookupElement
from twisted.web2.dav.resource import TwistedACLInheritable
@@ -42,7 +42,7 @@
from twisted.internet.defer import deferredGenerator, waitForDeferred
from twisted.web2 import responsecode
from twisted.web2.dav import auth, davxml
-from twisted.web2.dav.acl import DAVPrincipalResource
+from twisted.web2.dav.resource import DAVPrincipalResource
from twisted.web2.dav.davxml import dav_namespace
from twisted.web2.dav.http import ErrorResponse
from twisted.web2.dav.resource import DAVResource, TwistedACLInheritable
View
@@ -43,7 +43,7 @@
from twisted.python.filepath import FilePath
from twisted.web2 import responsecode
from twisted.web2.dav import davxml
-from twisted.web2.dav.acl import TwistedPasswordProperty
+from twisted.web2.dav.auth import TwistedPasswordProperty
from twisted.web2.dav.fileop import mkcollection, rmdir
from twisted.web2.dav.http import ErrorResponse
from twisted.web2.dav.idav import IDAVResource

0 comments on commit 6859c4a

Please sign in to comment.