[Neo-report] r1823 vincent - /trunk/neo/storage/database/mysqldb.py

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Feb 22 17:47:56 CET 2010


Author: vincent
Date: Mon Feb 22 17:47:51 2010
New Revision: 1823

Log:
Reduce try..except nesting.

Modified:
    trunk/neo/storage/database/mysqldb.py

Modified: trunk/neo/storage/database/mysqldb.py
==============================================================================
--- trunk/neo/storage/database/mysqldb.py [iso-8859-1] (original)
+++ trunk/neo/storage/database/mysqldb.py [iso-8859-1] Mon Feb 22 17:47:51 2010
@@ -264,16 +264,16 @@
                     % (oid, before_tid))
             try:
                 serial, compression, checksum, data = r[0]
-                r = q("""SELECT serial FROM obj
-                            WHERE oid = %d AND serial >= %d
-                            ORDER BY serial LIMIT 1""" \
-                        % (oid, before_tid))
-                try:
-                    next_serial = r[0][0]
-                except IndexError:
-                    next_serial = None
             except IndexError:
                 return None
+            r = q("""SELECT serial FROM obj
+                        WHERE oid = %d AND serial >= %d
+                        ORDER BY serial LIMIT 1""" \
+                    % (oid, before_tid))
+            try:
+                next_serial = r[0][0]
+            except IndexError:
+                next_serial = None
         else:
             # XXX I want to express "HAVING serial = MAX(serial)", but
             # MySQL does not use an index for a HAVING clause!





More information about the Neo-report mailing list