From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 15 Jan 2021 01:54:50 +0000 (+0100)
Subject: End-of-copy logic moved from exit to finish gen
X-Git-Tag: 3.0.dev0~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f549946d99f638af050ede1dbcabee8e7d632d0;p=thirdparty%2Fpsycopg.git

End-of-copy logic moved from exit to finish gen
---

diff --git a/psycopg3/psycopg3/copy.py b/psycopg3/psycopg3/copy.py
index ed577b7c4..20c8beaa4 100644
--- a/psycopg3/psycopg3/copy.py
+++ b/psycopg3/psycopg3/copy.py
@@ -129,6 +129,22 @@ class BaseCopy(Generic[ConnectionType]):
             berr = error.encode(self.connection.client_encoding, "replace")
             res = yield from copy_end(self._pgconn, berr)
         else:
+            if self.format == BINARY:
+                # If we have sent no data we need to send the signature
+                # and the trailer
+                if not self._signature_sent:
+                    self._write_buffer += _binary_signature
+                    self._write_buffer += _binary_trailer
+                elif self._row_mode:
+
+                    # if we have sent data already, we have sent the signature
+                    # too (either with the first row, or we assume that in
+                    # block mode the signature is included).
+                    # Write the trailer only if we are sending rows (with the
+                    # assumption that who is copying binary data is sending the
+                    # whole format).
+                    self._write_buffer += _binary_trailer
+
             if self._write_buffer:
                 yield from copy_to(self._pgconn, self._write_buffer)
                 self._write_buffer.clear()
@@ -152,24 +168,8 @@ class BaseCopy(Generic[ConnectionType]):
             yield from self._finish_gen(
                 f"error from Python: {exc_type.__qualname__} - {exc_val}"
             )
-            return
-
-        if self.format == BINARY:
-            # If we have sent no data we need to send the signature
-            # and the trailer
-            if not self._signature_sent:
-                self._write_buffer += _binary_signature
-                self._write_buffer += _binary_trailer
-            elif self._row_mode:
-                # if we have sent data already, we have sent the signature too
-                # (either with the first row, or we assume that in block mode
-                # the signature is included).
-                # Write the trailer only if we are sending rows (with the
-                # assumption that who is copying binary data is sending the
-                # whole format).
-                self._write_buffer += _binary_trailer
-
-        yield from self._finish_gen()
+        else:
+            yield from self._finish_gen()
 
     # Support methods