Uniform datetime dumpers names

diff --git a/psycopg3/psycopg3/types/datetime.py b/psycopg3/psycopg3/types/datetime.py
index 505356dd1002d60705d246ef7735a372ad9b9c90..3df7245ccedcfffcb6d5b6bb16d59507803d0e91 100644 (file)
--- a/psycopg3/psycopg3/types/datetime.py
+++ b/psycopg3/psycopg3/types/datetime.py
@@ -132,7 +132,7 @@ class TimeTzBinaryDumper(_BaseTimeDumper):
         return _pack_timetz(us, -int(off.total_seconds()))
 
 
-class _BaseDateTimeDumper(Dumper):
+class _BaseDatetimeDumper(Dumper):
     def get_key(
         self, obj: datetime, format: Pg3Format
     ) -> Union[type, Tuple[type]]:
@@ -147,7 +147,7 @@ class _BaseDateTimeDumper(Dumper):
         raise NotImplementedError
 
 
-class _BaseDateTimeTextDumper(_BaseDateTimeDumper):
+class _BaseDatetimeTextDumper(_BaseDatetimeDumper):
 
     format = Format.TEXT
 
@@ -157,7 +157,7 @@ class _BaseDateTimeTextDumper(_BaseDateTimeDumper):
         return str(obj).encode("utf8")
 
 
-class DateTimeTzDumper(_BaseDateTimeTextDumper):
+class DatetimeDumper(_BaseDatetimeTextDumper):
 
     _oid = builtins["timestamptz"].oid
 
@@ -165,15 +165,15 @@ class DateTimeTzDumper(_BaseDateTimeTextDumper):
         if obj.tzinfo:
             return self
         else:
-            return DateTimeDumper(self.cls)
+            return DatetimeNoTzDumper(self.cls)
 
 
-class DateTimeDumper(_BaseDateTimeTextDumper):
+class DatetimeNoTzDumper(_BaseDatetimeTextDumper):
 
     _oid = builtins["timestamp"].oid
 
 
-class DateTimeTzBinaryDumper(_BaseDateTimeDumper):
+class DatetimeBinaryDumper(_BaseDatetimeDumper):
 
     format = Format.BINARY
     _oid = builtins["timestamptz"].oid
@@ -189,10 +189,10 @@ class DateTimeTzBinaryDumper(_BaseDateTimeDumper):
         if obj.tzinfo:
             return self
         else:
-            return DateTimeBinaryDumper(self.cls)
+            return DatetimeNoTzBinaryDumper(self.cls)
 
 
-class DateTimeBinaryDumper(_BaseDateTimeDumper):
+class DatetimeNoTzBinaryDumper(_BaseDatetimeDumper):
 
     format = Format.BINARY
     _oid = builtins["timestamp"].oid
@@ -205,7 +205,7 @@ class DateTimeBinaryDumper(_BaseDateTimeDumper):
         return pack_int8(micros)
 
 
-class TimeDeltaDumper(Dumper):
+class TimedeltaDumper(Dumper):
 
     format = Format.TEXT
     _oid = builtins["interval"].oid
@@ -232,7 +232,7 @@ class TimeDeltaDumper(Dumper):
         )
 
 
-class TimeDeltaBinaryDumper(Dumper):
+class TimedeltaBinaryDumper(Dumper):
 
     format = Format.BINARY
     _oid = builtins["interval"].oid
@@ -744,10 +744,10 @@ def register_default_globals(ctx: AdaptContext) -> None:
     DateBinaryDumper.register("datetime.date", ctx)
     TimeDumper.register("datetime.time", ctx)
     TimeBinaryDumper.register("datetime.time", ctx)
-    DateTimeTzDumper.register("datetime.datetime", ctx)
-    DateTimeTzBinaryDumper.register("datetime.datetime", ctx)
-    TimeDeltaDumper.register("datetime.timedelta", ctx)
-    TimeDeltaBinaryDumper.register("datetime.timedelta", ctx)
+    DatetimeDumper.register("datetime.datetime", ctx)
+    DatetimeBinaryDumper.register("datetime.datetime", ctx)
+    TimedeltaDumper.register("datetime.timedelta", ctx)
+    TimedeltaBinaryDumper.register("datetime.timedelta", ctx)
     DateLoader.register("date", ctx)
     DateBinaryLoader.register("date", ctx)
     TimeLoader.register("time", ctx)

diff --git a/psycopg3_c/psycopg3_c/types/datetime.pyx b/psycopg3_c/psycopg3_c/types/datetime.pyx
index 6d7361b74d2e90a9100a45877c9d4ea2e3b58494..4af9647f5e9a2c1465ff3316d2257f32188f5b02 100644 (file)
--- a/psycopg3_c/psycopg3_c/types/datetime.pyx
+++ b/psycopg3_c/psycopg3_c/types/datetime.pyx
@@ -209,7 +209,7 @@ cdef class TimeTzBinaryDumper(_BaseTimeDumper):
         return sizeof(int64_t) + sizeof(int32_t)
 
 
-cdef class _BaseDateTimeDumper(CDumper):
+cdef class _BaseDatetimeDumper(CDumper):
 
     cpdef get_key(self, obj, format):
         # Use (cls,) to report the need to upgrade (downgrade, actually) to a
@@ -223,7 +223,7 @@ cdef class _BaseDateTimeDumper(CDumper):
         raise NotImplementedError
 
 
-cdef class _BaseDateTimeTextDumper(_BaseDateTimeDumper):
+cdef class _BaseDatetimeTextDumper(_BaseDatetimeDumper):
 
     format = PQ_TEXT
 
@@ -242,7 +242,7 @@ cdef class _BaseDateTimeTextDumper(_BaseDateTimeDumper):
 
 
 @cython.final
-cdef class DateTimeTzDumper(_BaseDateTimeTextDumper):
+cdef class DatetimeDumper(_BaseDatetimeTextDumper):
 
     def __cinit__(self):
         self.oid = oids.TIMESTAMPTZ_OID
@@ -251,18 +251,18 @@ cdef class DateTimeTzDumper(_BaseDateTimeTextDumper):
         if obj.tzinfo:
             return self
         else:
-            return DateTimeDumper(self.cls)
+            return DatetimeNoTzDumper(self.cls)
 
 
 @cython.final
-cdef class DateTimeDumper(_BaseDateTimeTextDumper):
+cdef class DatetimeNoTzDumper(_BaseDatetimeTextDumper):
 
     def __cinit__(self):
         self.oid = oids.TIMESTAMP_OID
 
 
 @cython.final
-cdef class DateTimeTzBinaryDumper(_BaseDateTimeDumper):
+cdef class DatetimeBinaryDumper(_BaseDatetimeDumper):
 
     format = PQ_BINARY
 
@@ -284,11 +284,11 @@ cdef class DateTimeTzBinaryDumper(_BaseDateTimeDumper):
         if obj.tzinfo:
             return self
         else:
-            return DateTimeBinaryDumper(self.cls)
+            return DatetimeNoTzBinaryDumper(self.cls)
 
 
 @cython.final
-cdef class DateTimeBinaryDumper(_BaseDateTimeDumper):
+cdef class DatetimeNoTzBinaryDumper(_BaseDatetimeDumper):
 
     format = PQ_BINARY
 
@@ -308,7 +308,7 @@ cdef class DateTimeBinaryDumper(_BaseDateTimeDumper):
 
 
 @cython.final
-cdef class TimeDeltaDumper(CDumper):
+cdef class TimedeltaDumper(CDumper):
 
     format = PQ_TEXT
     cdef int _style
@@ -346,7 +346,7 @@ cdef class TimeDeltaDumper(CDumper):
 
 
 @cython.final
-cdef class TimeDeltaBinaryDumper(CDumper):
+cdef class TimedeltaBinaryDumper(CDumper):
 
     format = PQ_BINARY