From 89f70bdb3c9827e01f9a26a3944eccdafb5b212d Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Sun, 12 Dec 2010 13:36:30 +0000 Subject: [PATCH] Changed Python const RO -> READONLY. --- psycopg/adapter_asis.c | 2 +- psycopg/adapter_binary.c | 4 ++-- psycopg/adapter_datetime.c | 4 ++-- psycopg/adapter_list.c | 2 +- psycopg/adapter_mxdatetime.c | 4 ++-- psycopg/adapter_pboolean.c | 2 +- psycopg/adapter_pdecimal.c | 2 +- psycopg/adapter_pfloat.c | 2 +- psycopg/adapter_qstring.c | 6 +++--- psycopg/connection_type.c | 24 ++++++++++++------------ psycopg/cursor_type.c | 18 +++++++++--------- psycopg/lobject_type.c | 4 ++-- psycopg/microprotocols_proto.c | 2 +- psycopg/notify_type.c | 6 +++--- psycopg/typecast.c | 4 ++-- psycopg/xid_type.c | 12 ++++++------ 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/psycopg/adapter_asis.c b/psycopg/adapter_asis.c index 5f3da8bf..ccf38bae 100644 --- a/psycopg/adapter_asis.c +++ b/psycopg/adapter_asis.c @@ -74,7 +74,7 @@ asis_conform(asisObject *self, PyObject *args) /* object member list */ static struct PyMemberDef asisObject_members[] = { - {"adapted", T_OBJECT, offsetof(asisObject, wrapped), RO}, + {"adapted", T_OBJECT, offsetof(asisObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/adapter_binary.c b/psycopg/adapter_binary.c index 63d705e4..28bf8e7a 100644 --- a/psycopg/adapter_binary.c +++ b/psycopg/adapter_binary.c @@ -149,8 +149,8 @@ binary_conform(binaryObject *self, PyObject *args) /* object member list */ static struct PyMemberDef binaryObject_members[] = { - {"adapted", T_OBJECT, offsetof(binaryObject, wrapped), RO}, - {"buffer", T_OBJECT, offsetof(binaryObject, buffer), RO}, + {"adapted", T_OBJECT, offsetof(binaryObject, wrapped), READONLY}, + {"buffer", T_OBJECT, offsetof(binaryObject, buffer), READONLY}, {NULL} }; diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c index 9fd08575..7cfcda0f 100644 --- a/psycopg/adapter_datetime.c +++ b/psycopg/adapter_datetime.c @@ -133,8 +133,8 @@ pydatetime_conform(pydatetimeObject *self, PyObject *args) /* object member list */ static struct PyMemberDef pydatetimeObject_members[] = { - {"adapted", T_OBJECT, offsetof(pydatetimeObject, wrapped), RO}, - {"type", T_INT, offsetof(pydatetimeObject, type), RO}, + {"adapted", T_OBJECT, offsetof(pydatetimeObject, wrapped), READONLY}, + {"type", T_INT, offsetof(pydatetimeObject, type), READONLY}, {NULL} }; diff --git a/psycopg/adapter_list.c b/psycopg/adapter_list.c index d4436b0a..40598be7 100644 --- a/psycopg/adapter_list.c +++ b/psycopg/adapter_list.c @@ -136,7 +136,7 @@ list_conform(listObject *self, PyObject *args) /* object member list */ static struct PyMemberDef listObject_members[] = { - {"adapted", T_OBJECT, offsetof(listObject, wrapped), RO}, + {"adapted", T_OBJECT, offsetof(listObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/adapter_mxdatetime.c b/psycopg/adapter_mxdatetime.c index 3ce0f031..29012203 100644 --- a/psycopg/adapter_mxdatetime.c +++ b/psycopg/adapter_mxdatetime.c @@ -137,8 +137,8 @@ mxdatetime_conform(mxdatetimeObject *self, PyObject *args) /* object member list */ static struct PyMemberDef mxdatetimeObject_members[] = { - {"adapted", T_OBJECT, offsetof(mxdatetimeObject, wrapped), RO}, - {"type", T_INT, offsetof(mxdatetimeObject, type), RO}, + {"adapted", T_OBJECT, offsetof(mxdatetimeObject, wrapped), READONLY}, + {"type", T_INT, offsetof(mxdatetimeObject, type), READONLY}, {NULL} }; diff --git a/psycopg/adapter_pboolean.c b/psycopg/adapter_pboolean.c index 8425805b..f802832c 100644 --- a/psycopg/adapter_pboolean.c +++ b/psycopg/adapter_pboolean.c @@ -83,7 +83,7 @@ pboolean_conform(pbooleanObject *self, PyObject *args) /* object member list */ static struct PyMemberDef pbooleanObject_members[] = { - {"adapted", T_OBJECT, offsetof(pbooleanObject, wrapped), RO}, + {"adapted", T_OBJECT, offsetof(pbooleanObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/adapter_pdecimal.c b/psycopg/adapter_pdecimal.c index b9850b46..d5953e88 100644 --- a/psycopg/adapter_pdecimal.c +++ b/psycopg/adapter_pdecimal.c @@ -105,7 +105,7 @@ pdecimal_conform(pdecimalObject *self, PyObject *args) /* object member list */ static struct PyMemberDef pdecimalObject_members[] = { - {"adapted", T_OBJECT, offsetof(pdecimalObject, wrapped), RO}, + {"adapted", T_OBJECT, offsetof(pdecimalObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/adapter_pfloat.c b/psycopg/adapter_pfloat.c index 3ae34a4f..18c2e510 100644 --- a/psycopg/adapter_pfloat.c +++ b/psycopg/adapter_pfloat.c @@ -75,7 +75,7 @@ pfloat_conform(pfloatObject *self, PyObject *args) /* object member list */ static struct PyMemberDef pfloatObject_members[] = { - {"adapted", T_OBJECT, offsetof(pfloatObject, wrapped), RO}, + {"adapted", T_OBJECT, offsetof(pfloatObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/adapter_qstring.c b/psycopg/adapter_qstring.c index 1b147f59..8b65fbaa 100644 --- a/psycopg/adapter_qstring.c +++ b/psycopg/adapter_qstring.c @@ -181,9 +181,9 @@ qstring_conform(qstringObject *self, PyObject *args) /* object member list */ static struct PyMemberDef qstringObject_members[] = { - {"adapted", T_OBJECT, offsetof(qstringObject, wrapped), RO}, - {"buffer", T_OBJECT, offsetof(qstringObject, buffer), RO}, - {"encoding", T_STRING, offsetof(qstringObject, encoding), RO}, + {"adapted", T_OBJECT, offsetof(qstringObject, wrapped), READONLY}, + {"buffer", T_OBJECT, offsetof(qstringObject, buffer), READONLY}, + {"encoding", T_STRING, offsetof(qstringObject, encoding), READONLY}, {NULL} }; diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c index d884b004..f663b1fa 100644 --- a/psycopg/connection_type.c +++ b/psycopg/connection_type.c @@ -787,31 +787,31 @@ static struct PyMethodDef connectionObject_methods[] = { static struct PyMemberDef connectionObject_members[] = { #ifdef PSYCOPG_EXTENSIONS - {"closed", T_LONG, offsetof(connectionObject, closed), RO, + {"closed", T_LONG, offsetof(connectionObject, closed), READONLY, "True if the connection is closed."}, {"isolation_level", T_LONG, - offsetof(connectionObject, isolation_level), RO, + offsetof(connectionObject, isolation_level), READONLY, "The current isolation level."}, - {"encoding", T_STRING, offsetof(connectionObject, encoding), RO, + {"encoding", T_STRING, offsetof(connectionObject, encoding), READONLY, "The current client encoding."}, - {"notices", T_OBJECT, offsetof(connectionObject, notice_list), RO}, - {"notifies", T_OBJECT, offsetof(connectionObject, notifies), RO}, - {"dsn", T_STRING, offsetof(connectionObject, dsn), RO, + {"notices", T_OBJECT, offsetof(connectionObject, notice_list), READONLY}, + {"notifies", T_OBJECT, offsetof(connectionObject, notifies), READONLY}, + {"dsn", T_STRING, offsetof(connectionObject, dsn), READONLY, "The current connection string."}, - {"async", T_LONG, offsetof(connectionObject, async), RO, + {"async", T_LONG, offsetof(connectionObject, async), READONLY, "True if the connection is asynchronous."}, {"status", T_INT, - offsetof(connectionObject, status), RO, + offsetof(connectionObject, status), READONLY, "The current transaction status."}, - {"string_types", T_OBJECT, offsetof(connectionObject, string_types), RO, + {"string_types", T_OBJECT, offsetof(connectionObject, string_types), READONLY, "A set of typecasters to convert textual values."}, - {"binary_types", T_OBJECT, offsetof(connectionObject, binary_types), RO, + {"binary_types", T_OBJECT, offsetof(connectionObject, binary_types), READONLY, "A set of typecasters to convert binary values."}, {"protocol_version", T_INT, - offsetof(connectionObject, protocol), RO, + offsetof(connectionObject, protocol), READONLY, "Protocol version used for this connection. Currently always 3."}, {"server_version", T_INT, - offsetof(connectionObject, server_version), RO, + offsetof(connectionObject, server_version), READONLY, "Server version."}, #endif {NULL} diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c index 064b985e..d7f848a8 100644 --- a/psycopg/cursor_type.c +++ b/psycopg/cursor_type.c @@ -1540,29 +1540,29 @@ static struct PyMethodDef cursorObject_methods[] = { static struct PyMemberDef cursorObject_members[] = { /* DBAPI-2.0 basics */ - {"rowcount", T_LONG, OFFSETOF(rowcount), RO, + {"rowcount", T_LONG, OFFSETOF(rowcount), READONLY, "Number of rows read from the backend in the last command."}, {"arraysize", T_LONG, OFFSETOF(arraysize), 0, "Number of records `fetchmany()` must fetch if not explicitly " \ "specified."}, - {"description", T_OBJECT, OFFSETOF(description), RO, + {"description", T_OBJECT, OFFSETOF(description), READONLY, "Cursor description as defined in DBAPI-2.0."}, - {"lastrowid", T_LONG, OFFSETOF(lastoid), RO, + {"lastrowid", T_LONG, OFFSETOF(lastoid), READONLY, "The ``oid`` of the last row inserted by the cursor."}, /* DBAPI-2.0 extensions */ - {"rownumber", T_LONG, OFFSETOF(row), RO, + {"rownumber", T_LONG, OFFSETOF(row), READONLY, "The current row position."}, - {"connection", T_OBJECT, OFFSETOF(conn), RO, + {"connection", T_OBJECT, OFFSETOF(conn), READONLY, "The connection where the cursor comes from."}, #ifdef PSYCOPG_EXTENSIONS - {"name", T_STRING, OFFSETOF(name), RO}, - {"statusmessage", T_OBJECT, OFFSETOF(pgstatus), RO, + {"name", T_STRING, OFFSETOF(name), READONLY}, + {"statusmessage", T_OBJECT, OFFSETOF(pgstatus), READONLY, "The return message of the last command."}, - {"query", T_OBJECT, OFFSETOF(query), RO, + {"query", T_OBJECT, OFFSETOF(query), READONLY, "The last query text sent to the backend."}, {"row_factory", T_OBJECT, OFFSETOF(tuple_factory), 0}, {"tzinfo_factory", T_OBJECT, OFFSETOF(tzinfo_factory), 0}, - {"typecaster", T_OBJECT, OFFSETOF(caster), RO}, + {"typecaster", T_OBJECT, OFFSETOF(caster), READONLY}, {"string_types", T_OBJECT, OFFSETOF(string_types), 0}, {"binary_types", T_OBJECT, OFFSETOF(binary_types), 0}, #endif diff --git a/psycopg/lobject_type.c b/psycopg/lobject_type.c index 98c11642..2cc65064 100644 --- a/psycopg/lobject_type.c +++ b/psycopg/lobject_type.c @@ -274,9 +274,9 @@ static struct PyMethodDef lobjectObject_methods[] = { /* object member list */ static struct PyMemberDef lobjectObject_members[] = { - {"oid", T_UINT, offsetof(lobjectObject, oid), RO, + {"oid", T_UINT, offsetof(lobjectObject, oid), READONLY, "The backend OID associated to this lobject."}, - {"mode", T_STRING, offsetof(lobjectObject, smode), RO, + {"mode", T_STRING, offsetof(lobjectObject, smode), READONLY, "Open mode ('r', 'w', 'rw' or 'n')."}, {NULL} }; diff --git a/psycopg/microprotocols_proto.c b/psycopg/microprotocols_proto.c index 620ca3ff..3214dadd 100644 --- a/psycopg/microprotocols_proto.c +++ b/psycopg/microprotocols_proto.c @@ -96,7 +96,7 @@ static struct PyMethodDef isqlquoteObject_methods[] = { static struct PyMemberDef isqlquoteObject_members[] = { /* DBAPI-2.0 extensions (exception objects) */ - {"_wrapped", T_OBJECT, offsetof(isqlquoteObject, wrapped), RO}, + {"_wrapped", T_OBJECT, offsetof(isqlquoteObject, wrapped), READONLY}, {NULL} }; diff --git a/psycopg/notify_type.c b/psycopg/notify_type.c index 963ff839..83dee9fb 100644 --- a/psycopg/notify_type.c +++ b/psycopg/notify_type.c @@ -54,9 +54,9 @@ static const char payload_doc[] = "of the server this member is always the empty string."; static PyMemberDef notify_members[] = { - { "pid", T_OBJECT, offsetof(NotifyObject, pid), RO, (char *)pid_doc }, - { "channel", T_OBJECT, offsetof(NotifyObject, channel), RO, (char *)channel_doc }, - { "payload", T_OBJECT, offsetof(NotifyObject, payload), RO, (char *)payload_doc }, + { "pid", T_OBJECT, offsetof(NotifyObject, pid), READONLY, (char *)pid_doc }, + { "channel", T_OBJECT, offsetof(NotifyObject, channel), READONLY, (char *)channel_doc }, + { "payload", T_OBJECT, offsetof(NotifyObject, payload), READONLY, (char *)payload_doc }, { NULL } }; diff --git a/psycopg/typecast.c b/psycopg/typecast.c index f12178b0..e0a9b99d 100644 --- a/psycopg/typecast.c +++ b/psycopg/typecast.c @@ -390,8 +390,8 @@ typecast_richcompare(PyObject *obj1, PyObject* obj2, int opid) } static struct PyMemberDef typecastObject_members[] = { - {"name", T_OBJECT, OFFSETOF(name), RO}, - {"values", T_OBJECT, OFFSETOF(values), RO}, + {"name", T_OBJECT, OFFSETOF(name), READONLY}, + {"values", T_OBJECT, OFFSETOF(values), READONLY}, {NULL} }; diff --git a/psycopg/xid_type.c b/psycopg/xid_type.c index 54f8553b..bd26e1d7 100644 --- a/psycopg/xid_type.c +++ b/psycopg/xid_type.c @@ -68,12 +68,12 @@ static const char database_doc[] = "Database the recovered transaction belongs to."; static PyMemberDef xid_members[] = { - { "format_id", T_OBJECT, offsetof(XidObject, format_id), RO, (char *)format_id_doc }, - { "gtrid", T_OBJECT, offsetof(XidObject, gtrid), RO, (char *)gtrid_doc }, - { "bqual", T_OBJECT, offsetof(XidObject, bqual), RO, (char *)bqual_doc }, - { "prepared", T_OBJECT, offsetof(XidObject, prepared), RO, (char *)prepared_doc }, - { "owner", T_OBJECT, offsetof(XidObject, owner), RO, (char *)owner_doc }, - { "database", T_OBJECT, offsetof(XidObject, database), RO, (char *)database_doc }, + { "format_id", T_OBJECT, offsetof(XidObject, format_id), READONLY, (char *)format_id_doc }, + { "gtrid", T_OBJECT, offsetof(XidObject, gtrid), READONLY, (char *)gtrid_doc }, + { "bqual", T_OBJECT, offsetof(XidObject, bqual), READONLY, (char *)bqual_doc }, + { "prepared", T_OBJECT, offsetof(XidObject, prepared), READONLY, (char *)prepared_doc }, + { "owner", T_OBJECT, offsetof(XidObject, owner), READONLY, (char *)owner_doc }, + { "database", T_OBJECT, offsetof(XidObject, database), READONLY, (char *)database_doc }, { NULL } };