Using PyVarObject_HEAD_INIT macro.

17 files changed, 17 insertions, 34 deletions

diff --git a/psycopg/adapter_asis.c b/psycopg/adapter_asis.c
index f779c16..b0e7bc8 100644
--- a/psycopg/adapter_asis.c
+++ b/psycopg/adapter_asis.c
@@ -165,8 +165,7 @@ asis_repr(asisObject *self)
 "AsIs(str) -> new AsIs adapter object"
 
 PyTypeObject asisType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.AsIs",
     sizeof(asisObject),
     0,
diff --git a/psycopg/adapter_binary.c b/psycopg/adapter_binary.c
index fd46918..ed477b7 100644
--- a/psycopg/adapter_binary.c
+++ b/psycopg/adapter_binary.c
@@ -249,8 +249,7 @@ binary_repr(binaryObject *self)
 "Binary(buffer) -> new binary object"
 
 PyTypeObject binaryType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.Binary",
     sizeof(binaryObject),
     0,
diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c
index 2dab61c..ec1f2d4 100644
--- a/psycopg/adapter_datetime.c
+++ b/psycopg/adapter_datetime.c
@@ -225,8 +225,7 @@ pydatetime_repr(pydatetimeObject *self)
 "datetime(datetime, type) -> new datetime wrapper object"
 
 PyTypeObject pydatetimeType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.datetime",
     sizeof(pydatetimeObject),
     0,
diff --git a/psycopg/adapter_list.c b/psycopg/adapter_list.c
index e98e72b..5384618 100644
--- a/psycopg/adapter_list.c
+++ b/psycopg/adapter_list.c
@@ -239,8 +239,7 @@ list_repr(listObject *self)
 "List(list) -> new list wrapper object"
 
 PyTypeObject listType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.List",
     sizeof(listObject),
     0,
diff --git a/psycopg/adapter_mxdatetime.c b/psycopg/adapter_mxdatetime.c
index 0216250..36ef48a 100644
--- a/psycopg/adapter_mxdatetime.c
+++ b/psycopg/adapter_mxdatetime.c
@@ -233,8 +233,7 @@ mxdatetime_repr(mxdatetimeObject *self)
 "MxDateTime(mx, type) -> new mx.DateTime wrapper object"
 
 PyTypeObject mxdatetimeType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.MxDateTime",
     sizeof(mxdatetimeObject),
     0,
diff --git a/psycopg/adapter_pboolean.c b/psycopg/adapter_pboolean.c
index d1c8f70..73284a8 100644
--- a/psycopg/adapter_pboolean.c
+++ b/psycopg/adapter_pboolean.c
@@ -177,8 +177,7 @@ pboolean_repr(pbooleanObject *self)
 "Boolean(str) -> new Boolean adapter object"
 
 PyTypeObject pbooleanType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.Boolean",
     sizeof(pbooleanObject),
     0,
diff --git a/psycopg/adapter_pdecimal.c b/psycopg/adapter_pdecimal.c
index 0b7b7d6..c877eae 100644
--- a/psycopg/adapter_pdecimal.c
+++ b/psycopg/adapter_pdecimal.c
@@ -199,8 +199,7 @@ pdecimal_repr(pdecimalObject *self)
 "Decimal(str) -> new Decimal adapter object"
 
 PyTypeObject pdecimalType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.Decimal",
     sizeof(pdecimalObject),
     0,
diff --git a/psycopg/adapter_pfloat.c b/psycopg/adapter_pfloat.c
index 1aaee99..f75424e 100644
--- a/psycopg/adapter_pfloat.c
+++ b/psycopg/adapter_pfloat.c
@@ -169,8 +169,7 @@ pfloat_repr(pfloatObject *self)
 "Float(str) -> new Float adapter object"
 
 PyTypeObject pfloatType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.Float",
     sizeof(pfloatObject),
     0,
diff --git a/psycopg/adapter_qstring.c b/psycopg/adapter_qstring.c
index 6b6fe33..d4338be 100644
--- a/psycopg/adapter_qstring.c
+++ b/psycopg/adapter_qstring.c
@@ -291,8 +291,7 @@ qstring_repr(qstringObject *self)
 "QuotedString(str, enc) -> new quoted object with 'enc' encoding"
 
 PyTypeObject qstringType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.QuotedString",
     sizeof(qstringObject),
     0,
diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c
index 5a46982..0f10276 100644
--- a/psycopg/connection_type.c
+++ b/psycopg/connection_type.c
@@ -978,8 +978,7 @@ connection_traverse(connectionObject *self, visitproc visit, void *arg)
 "    ProgrammingError, IntegrityError, DataError, NotSupportedError"
 
 PyTypeObject connectionType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.connection",
     sizeof(connectionObject),
     0,
diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c
index 6b40032..0a39896 100644
--- a/psycopg/cursor_type.c
+++ b/psycopg/cursor_type.c
@@ -1719,8 +1719,7 @@ cursor_traverse(cursorObject *self, visitproc visit, void *arg)
 "A database cursor."
 
 PyTypeObject cursorType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.cursor",
     sizeof(cursorObject),
     0,
diff --git a/psycopg/lobject_type.c b/psycopg/lobject_type.c
index 9284bb8..29dcddc 100644
--- a/psycopg/lobject_type.c
+++ b/psycopg/lobject_type.c
@@ -377,8 +377,7 @@ lobject_repr(lobjectObject *self)
 "A database large object."
 
 PyTypeObject lobjectType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.lobject",
     sizeof(lobjectObject),
     0,
diff --git a/psycopg/microprotocols_proto.c b/psycopg/microprotocols_proto.c
index f71eec1..d929c56 100644
--- a/psycopg/microprotocols_proto.c
+++ b/psycopg/microprotocols_proto.c
@@ -153,8 +153,7 @@ isqlquote_del(PyObject* self)
 "returning the SQL representation of the object.\n\n"
 
 PyTypeObject isqlquoteType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.ISQLQuote",
     sizeof(isqlquoteObject),
     0,
diff --git a/psycopg/notify_type.c b/psycopg/notify_type.c
index 1439ab7..0287312 100644
--- a/psycopg/notify_type.c
+++ b/psycopg/notify_type.c
@@ -278,8 +278,7 @@ static PySequenceMethods notify_sequence = {
 
 
 PyTypeObject NotifyType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2.extensions.Notify",
     sizeof(NotifyObject),
     0,
diff --git a/psycopg/typecast.c b/psycopg/typecast.c
index 4688205..46b9c9f 100644
--- a/psycopg/typecast.c
+++ b/psycopg/typecast.c
@@ -452,8 +452,7 @@ typecast_call(PyObject *obj, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject typecastType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.type",
     sizeof(typecastObject),
     0,
diff --git a/psycopg/typecast_binary.c b/psycopg/typecast_binary.c
index f0d4f86..261fc6f 100644
--- a/psycopg/typecast_binary.c
+++ b/psycopg/typecast_binary.c
@@ -85,8 +85,7 @@ static PyBufferProcs chunk_as_buffer =
 #define chunk_doc "memory chunk"
 
 PyTypeObject chunkType = {
-    PyObject_HEAD_INIT(NULL)
-    0,                          /* ob_size */
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.chunk",   /* tp_name */
     sizeof(chunkObject),        /* tp_basicsize */
     0,                          /* tp_itemsize */
diff --git a/psycopg/xid_type.c b/psycopg/xid_type.c
index 68a9a21..9aed22a 100644
--- a/psycopg/xid_type.c
+++ b/psycopg/xid_type.c
@@ -304,8 +304,7 @@ static struct PyMethodDef xid_methods[] = {
 };
 
 PyTypeObject XidType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2.extensions.Xid",
     sizeof(XidObject),
     0,