From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 7 Aug 2020 02:43:21 +0000 (+0100)
Subject: PyxLoader renamed to CLoader
X-Git-Tag: 3.0.dev0~458^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13b2de1534e18ca8ffad27ac2f83256386ddb73;p=thirdparty%2Fpsycopg.git

PyxLoader renamed to CLoader
---

diff --git a/psycopg3/psycopg3/adapt.py b/psycopg3/psycopg3/adapt.py
index 6700dbec2..6d7cb796f 100644
--- a/psycopg3/psycopg3/adapt.py
+++ b/psycopg3/psycopg3/adapt.py
@@ -165,7 +165,7 @@ if pq.__impl__ == "c":
     from psycopg3_c import _psycopg3
 
     Transformer = _psycopg3.Transformer
-    _loader_classes = (Loader, _psycopg3.PyxLoader)  # type: ignore
+    _loader_classes = (Loader, _psycopg3.CLoader)  # type: ignore
 else:
     from . import transform
 
diff --git a/psycopg3_c/psycopg3_c/adapt.pyx b/psycopg3_c/psycopg3_c/adapt.pyx
index 1e628b901..2a88fb584 100644
--- a/psycopg3_c/psycopg3_c/adapt.pyx
+++ b/psycopg3_c/psycopg3_c/adapt.pyx
@@ -24,8 +24,7 @@ import logging
 logger = logging.getLogger("psycopg3.adapt")
 
 
-# TODO: rename after dropping CLoader below
-cdef class PyxLoader:
+cdef class CLoader:
     cdef impl.Oid oid
     cdef object context
     cdef object connection
diff --git a/psycopg3_c/psycopg3_c/transform.pyx b/psycopg3_c/psycopg3_c/transform.pyx
index 48682f135..bc6898bc0 100644
--- a/psycopg3_c/psycopg3_c/transform.pyx
+++ b/psycopg3_c/psycopg3_c/transform.pyx
@@ -25,7 +25,7 @@ TEXT_OID = 25
 
 cdef class RowLoader:
     cdef object pyloader
-    cdef PyxLoader pyxloader
+    cdef CLoader cloader
 
 
 cdef class Transformer:
@@ -170,10 +170,10 @@ cdef class Transformer:
         loader = self.get_loader(oid, fmt)
         row_loader.pyloader = loader.load
 
-        if isinstance(loader, PyxLoader):
-            row_loader.pyxloader = loader
+        if isinstance(loader, CLoader):
+            row_loader.cloader = loader
         else:
-            row_loader.pyxloader = None
+            row_loader.cloader = None
 
         return row_loader
 
@@ -223,8 +223,8 @@ cdef class Transformer:
 
             val = libpq.PQgetvalue(res, crow, col)
             loader = self._row_loaders[col]
-            if loader.pyxloader is not None:
-                pyval = loader.pyxloader.cload(val, length)
+            if loader.cloader is not None:
+                pyval = loader.cloader.cload(val, length)
             else:
                 # TODO: no copy
                 pyval = loader.pyloader(val[:length])
diff --git a/psycopg3_c/psycopg3_c/types/numeric.pyx b/psycopg3_c/psycopg3_c/types/numeric.pyx
index b554ad004..e53876401 100644
--- a/psycopg3_c/psycopg3_c/types/numeric.pyx
+++ b/psycopg3_c/psycopg3_c/types/numeric.pyx
@@ -12,32 +12,32 @@ from cpython.long cimport (
     PyLong_FromLong, PyLong_FromLongLong, PyLong_FromUnsignedLong)
 
 
-cdef class TextIntLoader(PyxLoader):
+cdef class TextIntLoader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return int(data)
 
 
-cdef class BinaryInt2Loader(PyxLoader):
+cdef class BinaryInt2Loader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return PyLong_FromLong(<int16_t>be16toh((<uint16_t *>data)[0]))
 
 
-cdef class BinaryInt4Loader(PyxLoader):
+cdef class BinaryInt4Loader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return PyLong_FromLong(<int32_t>be32toh((<uint32_t *>data)[0]))
 
 
-cdef class BinaryInt8Loader(PyxLoader):
+cdef class BinaryInt8Loader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return PyLong_FromLongLong(<int64_t>be64toh((<uint64_t *>data)[0]))
 
 
-cdef class BinaryOidLoader(PyxLoader):
+cdef class BinaryOidLoader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return PyLong_FromUnsignedLong(be32toh((<uint32_t *>data)[0]))
 
 
-cdef class BinaryBoolLoader(PyxLoader):
+cdef class BinaryBoolLoader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         if data[0]:
             return True
diff --git a/psycopg3_c/psycopg3_c/types/text.pyx b/psycopg3_c/psycopg3_c/types/text.pyx
index 188bafe83..ed1a36d36 100644
--- a/psycopg3_c/psycopg3_c/types/text.pyx
+++ b/psycopg3_c/psycopg3_c/types/text.pyx
@@ -9,7 +9,7 @@ from cpython.unicode cimport PyUnicode_DecodeUTF8
 from psycopg3_c cimport libpq
 
 
-cdef class StringLoader(PyxLoader):
+cdef class StringLoader(CLoader):
     cdef int is_utf8
     cdef object pydecoder
 
@@ -38,7 +38,7 @@ cdef class StringLoader(PyxLoader):
             return b
 
 
-cdef class TextByteaLoader(PyxLoader):
+cdef class TextByteaLoader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         cdef size_t len_out
         cdef unsigned char *out = libpq.PQunescapeBytea(
@@ -53,7 +53,7 @@ cdef class TextByteaLoader(PyxLoader):
         return rv
 
 
-cdef class BinaryByteaLoader(PyxLoader):
+cdef class BinaryByteaLoader(CLoader):
     cdef object cload(self, const char *data, size_t length):
         return data[:length]