[CalendarServer-changes] [9921] CalendarServer/branches/users/gaya/sharedgroups/txdav/common/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 9921
          http://trac.calendarserver.org//changeset/9921
Author:   gaya at apple.com
Date:     2012-10-10 19:33:10 -0700 (Wed, 10 Oct 2012)
Log Message:
-----------
remove unneeded try: finally: in CommonHomeChild._removeObjectResource()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2012-10-10 17:51:28 UTC (rev 9920)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2012-10-11 02:33:10 UTC (rev 9921)
@@ -3220,13 +3220,11 @@
     def _removeObjectResource(self, child):
         name = child.name()
         uid = child.uid()
-        try:
-            yield child.remove()
-        finally:
-            self._objects.pop(name, None)
-            self._objects.pop(uid, None)
-            yield self._deleteRevision(name)
-            yield self.notifyChanged()
+        yield child.remove()
+        self._objects.pop(name, None)
+        self._objects.pop(uid, None)
+        yield self._deleteRevision(name)
+        yield self.notifyChanged()
 
 
     @classproperty
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121010/e1bf88f5/attachment.html>