[CalendarServer-changes] [3366] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3366
          http://trac.macosforge.org/projects/calendarserver/changeset/3366
Author:   cdaboo at apple.com
Date:     2008-11-11 11:35:35 -0800 (Tue, 11 Nov 2008)
Log Message:
-----------
try/except/finally works properly on Python 2.5.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/index.py
    CalendarServer/trunk/twistedcaldav/sql.py

Modified: CalendarServer/trunk/twistedcaldav/index.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/index.py	2008-11-11 18:57:30 UTC (rev 3365)
+++ CalendarServer/trunk/twistedcaldav/index.py	2008-11-11 19:35:35 UTC (rev 3366)
@@ -687,16 +687,15 @@
                 log.err("Unable to open resource %s: %s" % (name, e))
                 continue
 
+            # FIXME: This is blocking I/O
             try:
-                # FIXME: This is blocking I/O
-                try:
-                    calendar = Component.fromStream(stream)
-                    calendar.validateForCalDAV()
-                except ValueError:
-                    log.err("Non-calendar resource: %s" % (name,))
-                else:
-                    #log.msg("Indexing resource: %s" % (name,))
-                    self.addResource(name, calendar, True)
+                calendar = Component.fromStream(stream)
+                calendar.validateForCalDAV()
+            except ValueError:
+                log.err("Non-calendar resource: %s" % (name,))
+            else:
+                #log.msg("Indexing resource: %s" % (name,))
+                self.addResource(name, calendar, True)
             finally:
                 stream.close()
 
@@ -799,17 +798,16 @@
                 log.err("Unable to open resource %s: %s" % (name, e))
                 continue
 
+            # FIXME: This is blocking I/O
             try:
-                # FIXME: This is blocking I/O
-                try:
-                    calendar = Component.fromStream(stream)
-                    calendar.validCalendarForCalDAV()
-                    calendar.validateComponentsForCalDAV(True)
-                except ValueError:
-                    log.err("Non-calendar resource: %s" % (name,))
-                else:
-                    #log.msg("Indexing resource: %s" % (name,))
-                    self.addResource(name, calendar, True)
+                calendar = Component.fromStream(stream)
+                calendar.validCalendarForCalDAV()
+                calendar.validateComponentsForCalDAV(True)
+            except ValueError:
+                log.err("Non-calendar resource: %s" % (name,))
+            else:
+                #log.msg("Indexing resource: %s" % (name,))
+                self.addResource(name, calendar, True)
             finally:
                 stream.close()
 

Modified: CalendarServer/trunk/twistedcaldav/sql.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sql.py	2008-11-11 18:57:30 UTC (rev 3365)
+++ CalendarServer/trunk/twistedcaldav/sql.py	2008-11-11 19:35:35 UTC (rev 3366)
@@ -302,12 +302,11 @@
         """
         q = self._db().cursor()
         try:
-            try:
-                q.execute(sql, query_params)
-            except:
-                log.err("Exception while executing SQL on DB %s: %r %r" % (self, sql, query_params))
-                raise
+            q.execute(sql, query_params)
             return q.fetchall()
+        except:
+            log.err("Exception while executing SQL on DB %s: %r %r" % (self, sql, query_params))
+            raise
         finally:
             q.close()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081111/daa64f0f/attachment.html>