T198705 unbound local error (#6)

perfact · Jun 16, 2020 · 4bb29e9 · 4bb29e9
1 parent 86e4607
commit 4bb29e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.4.7.dev1+perfact.3
+--------------------
+
+Bugfix for `UnboundLocalError` in Python 3
+
 2.4.7.dev1+perfact.2
 --------------------
 

diff --git a/Products/ZPsycopgDA/__init__.py b/Products/ZPsycopgDA/__init__.py
@@ -16,7 +16,7 @@
 # their work without bothering about the module dependencies.
 
 __doc__ = "ZPsycopg Database Adapter Registration."
-__version__ = '2.4.7.dev1+perfact.2'
+__version__ = '2.4.7.dev1+perfact.3'
 
 # Python2 backward compatibility
 try:

diff --git a/Products/ZPsycopgDA/db.py b/Products/ZPsycopgDA/db.py
@@ -387,10 +387,12 @@ def query(self, query_string, max_rows=None, query_data=None):
         self._register()
         self.calls = self.calls+1
 
+        error = None
         for retry in range(2):
             try:
                 return self.query_inner(query_string, max_rows, query_data)
             except Exception as err:
+                error = err
                 conn = self.getconn()
                 # First query in transaction yields a connection error - try to
                 # simply reconnect
@@ -405,7 +407,7 @@ def query(self, query_string, max_rows=None, query_data=None):
                 break
 
         # We only reach this if another error occured
-        self.handle_retry(err)
+        self.handle_retry(error)
         self._abort()
 
         # Taint this transaction