fix: shorter traceback even on COPY statement error

The previous commit only addressed errors raised during transferring
data, not the initial COPY statement.

diff --git a/psycopg/psycopg/cursor.py b/psycopg/psycopg/cursor.py
index a7e81693b59d00563babeba37e5af1d98cb21487..fec09a032762dc615c494df22b0edd9be2a70721 100644 (file)
--- a/psycopg/psycopg/cursor.py
+++ b/psycopg/psycopg/cursor.py
@@ -664,10 +664,10 @@ class Cursor(BaseCursor["Connection[Any]", Row]):
 
         :rtype: Copy
         """
-        with self._conn.lock:
-            self._conn.wait(self._start_copy_gen(statement))
-
         try:
+            with self._conn.lock:
+                self._conn.wait(self._start_copy_gen(statement))
+
             with Copy(self) as copy:
                 yield copy
         except e.Error as ex:

diff --git a/psycopg/psycopg/cursor_async.py b/psycopg/psycopg/cursor_async.py
index 182e5ffcceab19d6adacc816ec86a2570825e6b3..830a20b0d4e6f51517df57b932707cdfbc37802d 100644 (file)
--- a/psycopg/psycopg/cursor_async.py
+++ b/psycopg/psycopg/cursor_async.py
@@ -151,10 +151,10 @@ class AsyncCursor(BaseCursor["AsyncConnection[Any]", Row]):
         """
         :rtype: AsyncCopy
         """
-        async with self._conn.lock:
-            await self._conn.wait(self._start_copy_gen(statement))
-
         try:
+            async with self._conn.lock:
+                await self._conn.wait(self._start_copy_gen(statement))
+
             async with AsyncCopy(self) as copy:
                 yield copy
         except e.Error as ex: