[CalendarServer-changes] [8327] CalendarServer/branches/users/glyph/multiget-delete/txdav/caldav/ datastore/file.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Nov 18 10:14:09 PST 2011


Revision: 8327
          http://trac.macosforge.org/projects/calendarserver/changeset/8327
Author:   glyph at apple.com
Date:     2011-11-18 10:14:09 -0800 (Fri, 18 Nov 2011)
Log Message:
-----------
file implementation - NoSuchObjectResourceError was being raised before (not IOError as multiget assumed!), so let's fix that to be the new exception type

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/multiget-delete/txdav/caldav/datastore/file.py

Modified: CalendarServer/branches/users/glyph/multiget-delete/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/multiget-delete/txdav/caldav/datastore/file.py	2011-11-18 18:14:00 UTC (rev 8326)
+++ CalendarServer/branches/users/glyph/multiget-delete/txdav/caldav/datastore/file.py	2011-11-18 18:14:09 UTC (rev 8327)
@@ -62,8 +62,8 @@
     CommonObjectResource, CommonStubResource)
 from txdav.caldav.icalendarstore import QuotaExceeded
 
-from txdav.common.icommondatastore import (NoSuchObjectResourceError,
-    InternalDataStoreError)
+from txdav.common.icommondatastore import ConcurrentModification
+from txdav.common.icommondatastore import InternalDataStoreError
 from txdav.base.datastore.file import writeOperation, hidden, FileMetaDataMixin
 from txdav.base.propertystore.base import PropertyName
 
@@ -375,7 +375,7 @@
             fh = self._path.open()
         except IOError, e:
             if e[0] == ENOENT:
-                raise NoSuchObjectResourceError(self)
+                raise ConcurrentModification()
             else:
                 raise
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111118/d88583cf/attachment.html>


More information about the calendarserver-changes mailing list