From: Denis Laxalde <denis@laxalde.org>
Date: Tue, 4 Oct 2022 19:41:22 +0000 (+0200)
Subject: refactor: handle exit exception in BasePipeline._exit()
X-Git-Tag: 3.1.4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ae2d3dc3e69e3dd476d5e6465c3c068cea6453;p=thirdparty%2Fpsycopg.git

refactor: handle exit exception in BasePipeline._exit()

We remove repeated code in __(a)exit__() method of (Async)Pipeline by
passing the exception value to _exit() method of BasePipeline.
---

diff --git a/psycopg/psycopg/_pipeline.py b/psycopg/psycopg/_pipeline.py
index 75bb6b2eb..fe4bf54fc 100644
--- a/psycopg/psycopg/_pipeline.py
+++ b/psycopg/psycopg/_pipeline.py
@@ -104,10 +104,19 @@ class BasePipeline:
             yield from self._sync_gen()
         self.level += 1
 
-    def _exit(self) -> None:
+    def _exit(self, exc: Optional[BaseException]) -> None:
         self.level -= 1
         if self.level == 0 and self.pgconn.status != BAD:
-            self.pgconn.exit_pipeline_mode()
+            try:
+                self.pgconn.exit_pipeline_mode()
+            except e.OperationalError as exc2:
+                # Notice that this error might be pretty irrecoverable. It
+                # happens on COPY, for instance: even if sync succeeds, exiting
+                # fails with "cannot exit pipeline mode with uncollected results"
+                if exc:
+                    logger.warning("error ignored exiting %r: %s", self, exc2)
+                else:
+                    raise exc2.with_traceback(None)
 
     def _sync_gen(self) -> PQGen[None]:
         self._enqueue_sync()
@@ -234,16 +243,7 @@ class Pipeline(BasePipeline):
             else:
                 raise exc2.with_traceback(None)
         finally:
-            try:
-                self._exit()
-            except Exception as exc2:
-                # Notice that this error might be pretty irrecoverable. It
-                # happens on COPY, for instance: even if sync succeeds, exiting
-                # fails with "cannot exit pipeline mode with uncollected results"
-                if exc_val:
-                    logger.warning("error ignored exiting %r: %s", self, exc2)
-                else:
-                    raise exc2.with_traceback(None)
+            self._exit(exc_val)
 
 
 class AsyncPipeline(BasePipeline):
@@ -284,10 +284,4 @@ class AsyncPipeline(BasePipeline):
             else:
                 raise exc2.with_traceback(None)
         finally:
-            try:
-                self._exit()
-            except Exception as exc2:
-                if exc_val:
-                    logger.warning("error ignored exiting %r: %s", self, exc2)
-                else:
-                    raise exc2.with_traceback(None)
+            self._exit(exc_val)