HackBase/python-cx_Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use named field structure initialization in order to clarify code and reduce

Browse Source 
clutter.
This commit is contained in:
Anthony Tuininga 2020-02-10 09:57:30 -07:00
parent 53a9f41ed1
commit 08346005a7
25 changed files with 189 additions and 963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cxoBuffer.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -58,4 +58,3 @@ int cxoBuffer_init(cxoBuffer *buf)
buf->obj = NULL; buf->obj = NULL;
return 0; return 0;
} }

56
src/cxoConnection.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -189,51 +189,20 @@ static PyGetSetDef cxoConnectionCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// declaration of Python type "Connection" // declaration of Python type
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeConnection = { PyTypeObject cxoPyTypeConnection = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Connection", // tp_name .tp_name = "cx_Oracle.Connection",
sizeof(cxoConnection), // tp_basicsize .tp_basicsize = sizeof(cxoConnection),
0, // tp_itemsize .tp_dealloc = (destructor) cxoConnection_free,
(destructor) cxoConnection_free, // tp_dealloc .tp_repr = (reprfunc) cxoConnection_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
0, // tp_getattr .tp_methods = cxoConnectionMethods,
0, // tp_setattr .tp_members = cxoConnectionMembers,
0, // tp_compare .tp_getset = cxoConnectionCalcMembers,
(reprfunc) cxoConnection_repr, // tp_repr .tp_init = (initproc) cxoConnection_init,
0, // tp_as_number .tp_new = (newfunc) cxoConnection_new
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
// tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoConnectionMethods, // tp_methods
cxoConnectionMembers, // tp_members
cxoConnectionCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
(initproc) cxoConnection_init, // tp_init
0, // tp_alloc
(newfunc) cxoConnection_new, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -2043,4 +2012,3 @@ static int cxoConnection_setModule(cxoConnection* conn, PyObject *value,
{ {
return cxoConnection_setAttrText(conn, value, dpiConn_setModule); return cxoConnection_setAttrText(conn, value, dpiConn_setModule);
} }

56
src/cxoCursor.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -128,47 +128,18 @@ static PyGetSetDef cxoCursorCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeCursor = { PyTypeObject cxoPyTypeCursor = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Cursor", // tp_name .tp_name = "cx_Oracle.Cursor",
sizeof(cxoCursor), // tp_basicsize .tp_basicsize = sizeof(cxoCursor),
0, // tp_itemsize .tp_dealloc = (destructor) cxoCursor_free,
(destructor) cxoCursor_free, // tp_dealloc .tp_repr = (reprfunc) cxoCursor_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
0, // tp_getattr .tp_iter = (getiterfunc) cxoCursor_getIter,
0, // tp_setattr .tp_iternext = (iternextfunc) cxoCursor_getNext,
0, // tp_compare .tp_methods = cxoCursorMethods,
(reprfunc) cxoCursor_repr, // tp_repr .tp_members = cxoCursorMembers,
0, // tp_as_number .tp_getset = cxoCursorCalcMembers,
0, // tp_as_sequence .tp_init = (initproc) cxoCursor_init,
0, // tp_as_mapping .tp_new = cxoCursor_new
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
// tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
(getiterfunc) cxoCursor_getIter, // tp_iter
(iternextfunc) cxoCursor_getNext, // tp_iternext
cxoCursorMethods, // tp_methods
cxoCursorMembers, // tp_members
cxoCursorCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
(initproc) cxoCursor_init, // tp_init
0, // tp_alloc
cxoCursor_new, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -2217,4 +2188,3 @@ static PyObject *cxoCursor_contextManagerExit(cxoCursor *cursor,
Py_INCREF(Py_False); Py_INCREF(Py_False);
return Py_False; return Py_False;
} }

48
src/cxoDeqOptions.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -71,46 +71,11 @@ static PyGetSetDef cxoDeqOptionsCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeDeqOptions = { PyTypeObject cxoPyTypeDeqOptions = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.DeqOptions", // tp_name .tp_name = "cx_Oracle.DeqOptions",
sizeof(cxoDeqOptions), // tp_basicsize .tp_basicsize = sizeof(cxoDeqOptions),
0, // tp_itemsize .tp_dealloc = (destructor) cxoDeqOptions_free,
(destructor) cxoDeqOptions_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_getset = cxoDeqOptionsCalcMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
0, // tp_members
cxoDeqOptionsCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -471,4 +436,3 @@ static int cxoDeqOptions_setWait(cxoDeqOptions *options, PyObject *valueObj,
return cxoError_raiseAndReturnInt(); return cxoError_raiseAndReturnInt();
return 0; return 0;
} }

48
src/cxoEnqOptions.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -43,46 +43,11 @@ static PyGetSetDef cxoEnqOptionsCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeEnqOptions = { PyTypeObject cxoPyTypeEnqOptions = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.EnqOptions", // tp_name .tp_name = "cx_Oracle.EnqOptions",
sizeof(cxoEnqOptions), // tp_basicsize .tp_basicsize = sizeof(cxoEnqOptions),
0, // tp_itemsize .tp_dealloc = (destructor) cxoEnqOptions_free,
(destructor) cxoEnqOptions_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_getset = cxoEnqOptionsCalcMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
0, // tp_members
cxoEnqOptionsCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -219,4 +184,3 @@ static int cxoEnqOptions_setVisibility(cxoEnqOptions *self,
return cxoError_raiseAndReturnInt(); return cxoError_raiseAndReturnInt();
return 0; return 0;
} }

51
src/cxoError.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -51,46 +51,14 @@ static PyMemberDef cxoErrorMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeError = { PyTypeObject cxoPyTypeError = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle._Error", // tp_name .tp_name = "cx_Oracle._Error",
sizeof(cxoError), // tp_basicsize .tp_basicsize = sizeof(cxoError),
0, // tp_itemsize .tp_dealloc = (destructor) cxoError_free,
(destructor) cxoError_free, // tp_dealloc .tp_str = (reprfunc) cxoError_str,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoErrorMethods,
0, // tp_setattr .tp_members = cxoErrorMembers,
0, // tp_compare .tp_new = cxoError_new
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
(reprfunc) cxoError_str, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoErrorMethods, // tp_methods
cxoErrorMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
cxoError_new, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -325,4 +293,3 @@ static PyObject *cxoError_str(cxoError *error)
Py_INCREF(error->message); Py_INCREF(error->message);
return error->message; return error->message;
} }

28
src/cxoFuture.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -23,25 +23,12 @@ static int cxoFuture_setAttr(cxoFuture*, PyObject*, PyObject*);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeFuture = { PyTypeObject cxoPyTypeFuture = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.__future__", // tp_name .tp_name = "cx_Oracle.__future__",
sizeof(cxoFuture), // tp_basicsize .tp_basicsize = sizeof(cxoFuture),
0, // tp_itemsize .tp_dealloc = (destructor) cxoFuture_free,
(destructor) cxoFuture_free, // tp_dealloc .tp_getattro = (getattrofunc) cxoFuture_getAttr,
0, // tp_print .tp_setattro = (setattrofunc) cxoFuture_setAttr,
0, // tp_getattr .tp_flags = Py_TPFLAGS_DEFAULT
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
(getattrofunc) cxoFuture_getAttr, // tp_getattro
(setattrofunc) cxoFuture_setAttr, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT // tp_flags
}; };
@ -75,4 +62,3 @@ static int cxoFuture_setAttr(cxoFuture *obj, PyObject *nameObject,
{ {
return 0; return 0;
} }

49
src/cxoLob.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -58,46 +58,12 @@ static PyMethodDef cxoLobMethods[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeLob = { PyTypeObject cxoPyTypeLob = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.LOB", // tp_name .tp_name = "cx_Oracle.LOB",
sizeof(cxoLob), // tp_basicsize .tp_basicsize = sizeof(cxoLob),
0, // tp_itemsize .tp_dealloc = (destructor) cxoLob_free,
(destructor) cxoLob_free, // tp_dealloc .tp_str = (reprfunc) cxoLob_str,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoLobMethods
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
(reprfunc) cxoLob_str, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoLobMethods, // tp_methods
0, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -481,4 +447,3 @@ static PyObject *cxoLob_fileExists(cxoLob *lob, PyObject *args)
Py_RETURN_TRUE; Py_RETURN_TRUE;
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }

2
src/cxoModule.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //

49
src/cxoMsgProps.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -74,46 +74,12 @@ static PyGetSetDef cxoCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeMsgProps = { PyTypeObject cxoPyTypeMsgProps = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.MessageProperties", // tp_name .tp_name = "cx_Oracle.MessageProperties",
sizeof(cxoMsgProps), // tp_basicsize .tp_basicsize = sizeof(cxoMsgProps),
0, // tp_itemsize .tp_dealloc = (destructor) cxoMsgProps_free,
(destructor) cxoMsgProps_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_members = cxoMembers,
0, // tp_getattr .tp_getset = cxoCalcMembers
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoMembers, // tp_members
cxoCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -416,4 +382,3 @@ static int cxoMsgProps_setPriority(cxoMsgProps *props, PyObject *valueObj,
{ {
return cxoMsgProps_setAttrInt32(props, valueObj, dpiMsgProps_setPriority); return cxoMsgProps_setAttrInt32(props, valueObj, dpiMsgProps_setPriority);
} }

40
src/cxoObject.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -75,34 +75,15 @@ static PyMemberDef cxoObjectMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeObject = { PyTypeObject cxoPyTypeObject = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Object", // tp_name .tp_name = "cx_Oracle.Object",
sizeof(cxoObject), // tp_basicsize .tp_basicsize = sizeof(cxoObject),
0, // tp_itemsize .tp_dealloc = (destructor) cxoObject_free,
(destructor) cxoObject_free, // tp_dealloc .tp_repr = (reprfunc) cxoObject_repr,
0, // tp_print .tp_getattro = (getattrofunc) cxoObject_getAttr,
0, // tp_getattr .tp_setattro = (setattrofunc) cxoObject_setAttr,
0, // tp_setattr .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_compare .tp_methods = cxoObjectMethods,
(reprfunc) cxoObject_repr, // tp_repr .tp_members = cxoObjectMembers
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
(getattrofunc) cxoObject_getAttr, // tp_getattro
(setattrofunc) cxoObject_setAttr, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoObjectMethods, // tp_methods
cxoObjectMembers // tp_members
}; };
@ -702,4 +683,3 @@ static PyObject *cxoObject_trim(cxoObject *obj, PyObject *args)
return cxoError_raiseAndReturnNull(); return cxoError_raiseAndReturnNull();
Py_RETURN_NONE; Py_RETURN_NONE;
} }

49
src/cxoObjectAttr.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -30,46 +30,12 @@ static PyMemberDef cxoObjectAttrMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeObjectAttr = { PyTypeObject cxoPyTypeObjectAttr = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.ObjectAttribute", // tp_name .tp_name = "cx_Oracle.ObjectAttribute",
sizeof(cxoObjectAttr), // tp_basicsize .tp_basicsize = sizeof(cxoObjectAttr),
0, // tp_itemsize .tp_dealloc = (destructor) cxoObjectAttr_free,
(destructor) cxoObjectAttr_free, // tp_dealloc .tp_repr = (reprfunc) cxoObjectAttr_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_members = cxoObjectAttrMembers
0, // tp_setattr
0, // tp_compare
(reprfunc) cxoObjectAttr_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoObjectAttrMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -158,4 +124,3 @@ static PyObject *cxoObjectAttr_repr(cxoObjectAttr *attr)
Py_DECREF(name); Py_DECREF(name);
return result; return result;
} }

51
src/cxoObjectType.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -52,46 +52,14 @@ static PyMemberDef cxoObjectTypeMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeObjectType = { PyTypeObject cxoPyTypeObjectType = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.ObjectType", // tp_name .tp_name = "cx_Oracle.ObjectType",
sizeof(cxoObjectType), // tp_basicsize .tp_basicsize = sizeof(cxoObjectType),
0, // tp_itemsize .tp_dealloc = (destructor) cxoObjectType_free,
(destructor) cxoObjectType_free, // tp_dealloc .tp_repr = (reprfunc) cxoObjectType_repr,
0, // tp_print .tp_call = (ternaryfunc) cxoObjectType_newObject,
0, // tp_getattr .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_setattr .tp_methods = cxoObjectTypeMethods,
0, // tp_compare .tp_members = cxoObjectTypeMembers,
(reprfunc) cxoObjectType_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
(ternaryfunc) cxoObjectType_newObject, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoObjectTypeMethods, // tp_methods
cxoObjectTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -299,4 +267,3 @@ static PyObject *cxoObjectType_newObject(cxoObjectType *objType,
return (PyObject*) obj; return (PyObject*) obj;
} }

49
src/cxoQueue.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -51,46 +51,13 @@ static PyMemberDef cxoMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeQueue = { PyTypeObject cxoPyTypeQueue = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Queue", // tp_name .tp_name = "cx_Oracle.Queue",
sizeof(cxoQueue), // tp_basicsize .tp_basicsize = sizeof(cxoQueue),
0, // tp_itemsize .tp_dealloc = (destructor) cxoQueue_free,
(destructor) cxoQueue_free, // tp_dealloc .tp_repr = (reprfunc) cxoQueue_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoMethods,
0, // tp_setattr .tp_members = cxoMembers
0, // tp_compare
(reprfunc) cxoQueue_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoMethods, // tp_methods
cxoMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };

53
src/cxoSessionPool.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -96,47 +96,15 @@ static PyGetSetDef cxoSessionPoolCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSessionPool = { PyTypeObject cxoPyTypeSessionPool = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SessionPool", // tp_name .tp_name = "cx_Oracle.SessionPool",
sizeof(cxoSessionPool), // tp_basicsize .tp_basicsize = sizeof(cxoSessionPool),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSessionPool_free,
(destructor) cxoSessionPool_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
0, // tp_print .tp_methods = cxoSessionPoolMethods,
0, // tp_getattr .tp_members = cxoSessionPoolMembers,
0, // tp_setattr .tp_getset = cxoSessionPoolCalcMembers,
0, // tp_compare .tp_init = (initproc) cxoSessionPool_init,
0, // tp_repr .tp_new = (newfunc) cxoSessionPool_new
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
// tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoSessionPoolMethods, // tp_methods
cxoSessionPoolMembers, // tp_members
cxoSessionPoolCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
(initproc) cxoSessionPool_init, // tp_init
0, // tp_alloc
(newfunc) cxoSessionPool_new, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -653,4 +621,3 @@ static int cxoSessionPool_setWaitTimeout(cxoSessionPool *pool, PyObject *value,
{ {
return cxoSessionPool_setAttribute(pool, value, dpiPool_setWaitTimeout); return cxoSessionPool_setAttribute(pool, value, dpiPool_setWaitTimeout);
} }

48
src/cxoSodaCollection.c
View File

@ -76,46 +76,14 @@ static PyGetSetDef cxoCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSodaCollection = { PyTypeObject cxoPyTypeSodaCollection = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SodaCollection", // tp_name .tp_name = "cx_Oracle.SodaCollection",
sizeof(cxoSodaCollection), // tp_basicsize .tp_basicsize = sizeof(cxoSodaCollection),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSodaCollection_free,
(destructor) cxoSodaCollection_free,// tp_dealloc .tp_repr = (reprfunc) cxoSodaCollection_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoMethods,
0, // tp_setattr .tp_members = cxoMembers,
0, // tp_compare .tp_getset = cxoCalcMembers
(reprfunc) cxoSodaCollection_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoMethods, // tp_methods
cxoMembers, // tp_members
cxoCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

49
src/cxoSodaDatabase.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -43,46 +43,12 @@ static PyMethodDef cxoMethods[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSodaDatabase = { PyTypeObject cxoPyTypeSodaDatabase = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SodaDatabase", // tp_name .tp_name = "cx_Oracle.SodaDatabase",
sizeof(cxoSodaDatabase), // tp_basicsize .tp_basicsize = sizeof(cxoSodaDatabase),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSodaDatabase_free,
(destructor) cxoSodaDatabase_free, // tp_dealloc .tp_repr = (reprfunc) cxoSodaDatabase_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoMethods
0, // tp_setattr
0, // tp_compare
(reprfunc) cxoSodaDatabase_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoMethods, // tp_methods
0, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -378,4 +344,3 @@ static PyObject *cxoSodaDatabase_openCollection(cxoSodaDatabase *db,
return (PyObject*) coll; return (PyObject*) coll;
} }

50
src/cxoSodaDoc.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -55,46 +55,13 @@ static PyGetSetDef cxoCalcMembers[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSodaDoc = { PyTypeObject cxoPyTypeSodaDoc = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SodaDoc", // tp_name .tp_name = "cx_Oracle.SodaDoc",
sizeof(cxoSodaDoc), // tp_basicsize .tp_basicsize = sizeof(cxoSodaDoc),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSodaDoc_free,
(destructor) cxoSodaDoc_free, // tp_dealloc .tp_repr = (reprfunc) cxoSodaDoc_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoMethods,
0, // tp_setattr .tp_getset = cxoCalcMembers
0, // tp_compare
(reprfunc) cxoSodaDoc_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoMethods, // tp_methods
0, // tp_members
cxoCalcMembers, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -306,4 +273,3 @@ static PyObject *cxoSodaDoc_getContentAsString(cxoSodaDoc *doc, PyObject *args)
return PyUnicode_Decode(content, contentLength, encoding, NULL); return PyUnicode_Decode(content, contentLength, encoding, NULL);
Py_RETURN_NONE; Py_RETURN_NONE;
} }

51
src/cxoSodaDocCursor.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -35,46 +35,14 @@ static PyMethodDef cxoMethods[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSodaDocCursor = { PyTypeObject cxoPyTypeSodaDocCursor = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SodaDocCursor", // tp_name .tp_name = "cx_Oracle.SodaDocCursor",
sizeof(cxoSodaDocCursor), // tp_basicsize .tp_basicsize = sizeof(cxoSodaDocCursor),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSodaDocCursor_free,
(destructor) cxoSodaDocCursor_free, // tp_dealloc .tp_repr = (reprfunc) cxoSodaDocCursor_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_iter = (getiterfunc) cxoSodaDocCursor_getIter,
0, // tp_setattr .tp_iternext = (iternextfunc) cxoSodaDocCursor_getNext,
0, // tp_compare .tp_methods = cxoMethods
(reprfunc) cxoSodaDocCursor_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
(getiterfunc) cxoSodaDocCursor_getIter, // tp_iter
(iternextfunc) cxoSodaDocCursor_getNext, // tp_iternext
cxoMethods, // tp_methods
0, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -181,4 +149,3 @@ static PyObject *cxoSodaDocCursor_getNext(cxoSodaDocCursor *cursor)
return NULL; return NULL;
return (PyObject*) doc; return (PyObject*) doc;
} }

49
src/cxoSodaOperation.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -59,46 +59,12 @@ static PyMethodDef cxoMethods[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSodaOperation = { PyTypeObject cxoPyTypeSodaOperation = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.SodaOperation", // tp_name .tp_name = "cx_Oracle.SodaOperation",
sizeof(cxoSodaOperation), // tp_basicsize .tp_basicsize = sizeof(cxoSodaOperation),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSodaOperation_free,
(destructor) cxoSodaOperation_free, // tp_dealloc .tp_repr = (reprfunc) cxoSodaOperation_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoMethods
0, // tp_setattr
0, // tp_compare
(reprfunc) cxoSodaOperation_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoMethods, // tp_methods
0, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -558,4 +524,3 @@ static PyObject *cxoSodaOperation_replaceOneAndGet(cxoSodaOperation *op,
return (PyObject*) cxoSodaDoc_new(op->coll->db, replacedHandle); return (PyObject*) cxoSodaDoc_new(op->coll->db, replacedHandle);
Py_RETURN_NONE; Py_RETURN_NONE;
} }

230
src/cxoSubscr.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -94,224 +94,51 @@ static PyMethodDef cxoSubscrTypeMethods[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PyTypeObject cxoPyTypeSubscr = { PyTypeObject cxoPyTypeSubscr = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Subscription", // tp_name .tp_name = "cx_Oracle.Subscription",
sizeof(cxoSubscr), // tp_basicsize .tp_basicsize = sizeof(cxoSubscr),
0, // tp_itemsize .tp_dealloc = (destructor) cxoSubscr_free,
(destructor) cxoSubscr_free, // tp_dealloc .tp_repr = (reprfunc) cxoSubscr_repr,
0, // tp_print .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_getattr .tp_methods = cxoSubscrTypeMethods,
0, // tp_setattr .tp_members = cxoSubscrTypeMembers
0, // tp_compare
(reprfunc) cxoSubscr_repr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
cxoSubscrTypeMethods, // tp_methods
cxoSubscrTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
PyTypeObject cxoPyTypeMessage = { PyTypeObject cxoPyTypeMessage = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.Message", // tp_name .tp_name = "cx_Oracle.Message",
sizeof(cxoMessage), // tp_basicsize .tp_basicsize = sizeof(cxoMessage),
0, // tp_itemsize .tp_dealloc = (destructor) cxoMessage_free,
(destructor) cxoMessage_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_members = cxoMessageTypeMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoMessageTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
PyTypeObject cxoPyTypeMessageTable = { PyTypeObject cxoPyTypeMessageTable = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.MessageTable", // tp_name .tp_name = "cx_Oracle.MessageTable",
sizeof(cxoMessageTable), // tp_basicsize .tp_basicsize = sizeof(cxoMessageTable),
0, // tp_itemsize .tp_dealloc = (destructor) cxoMessageTable_free,
(destructor) cxoMessageTable_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_members = cxoMessageTableTypeMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoMessageTableTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
PyTypeObject cxoPyTypeMessageRow = { PyTypeObject cxoPyTypeMessageRow = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.MessageRow", // tp_name .tp_name = "cx_Oracle.MessageRow",
sizeof(cxoMessageRow), // tp_basicsize .tp_basicsize = sizeof(cxoMessageRow),
0, // tp_itemsize .tp_dealloc = (destructor) cxoMessageRow_free,
(destructor) cxoMessageRow_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_members = cxoMessageRowTypeMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoMessageRowTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
PyTypeObject cxoPyTypeMessageQuery = { PyTypeObject cxoPyTypeMessageQuery = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"cx_Oracle.MessageQuery", // tp_name .tp_name = "cx_Oracle.MessageQuery",
sizeof(cxoMessageQuery), // tp_basicsize .tp_basicsize = sizeof(cxoMessageQuery),
0, // tp_itemsize .tp_dealloc = (destructor) cxoMessageQuery_free,
(destructor) cxoMessageQuery_free, // tp_dealloc .tp_flags = Py_TPFLAGS_DEFAULT,
0, // tp_print .tp_members = cxoMessageQueryTypeMembers
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
0, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
0, // tp_call
0, // tp_str
0, // tp_getattro
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
0, // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
0, // tp_iter
0, // tp_iternext
0, // tp_methods
cxoMessageQueryTypeMembers, // tp_members
0, // tp_getset
0, // tp_base
0, // tp_dict
0, // tp_descr_get
0, // tp_descr_set
0, // tp_dictoffset
0, // tp_init
0, // tp_alloc
0, // tp_new
0, // tp_free
0, // tp_is_gc
0 // tp_bases
}; };
@ -705,4 +532,3 @@ static void cxoMessageTable_free(cxoMessageTable *table)
Py_CLEAR(table->rows); Py_CLEAR(table->rows);
Py_TYPE(table)->tp_free((PyObject*) table); Py_TYPE(table)->tp_free((PyObject*) table);
} }

1
src/cxoTransform.c
View File

@ -724,4 +724,3 @@ PyObject *cxoTransform_toPython(cxoTransformNum transformNum,
return cxoError_raiseFromString(cxoNotSupportedErrorException, return cxoError_raiseFromString(cxoNotSupportedErrorException,
"Database value cannot be converted to a Python value"); "Database value cannot be converted to a Python value");
} }

1
src/cxoUtils.c
View File

@ -190,4 +190,3 @@ int cxoUtils_processSodaDocArg(cxoSodaDatabase *db, PyObject *arg,
return 0; return 0;
} }

40
src/cxoVar.c
View File

@ -1,5 +1,5 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
// //
// Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved. // Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
// //
@ -69,35 +69,14 @@ static PyMethodDef cxoVarMethods[] = {
#define DECLARE_VARIABLE_TYPE(INTERNAL_NAME, EXTERNAL_NAME) \ #define DECLARE_VARIABLE_TYPE(INTERNAL_NAME, EXTERNAL_NAME) \
PyTypeObject INTERNAL_NAME = { \ PyTypeObject INTERNAL_NAME = { \
PyVarObject_HEAD_INIT(NULL, 0) \ PyVarObject_HEAD_INIT(NULL, 0) \
"cx_Oracle." #EXTERNAL_NAME, /* tp_name */ \ .tp_name = "cx_Oracle." #EXTERNAL_NAME, \
sizeof(cxoVar), /* tp_basicsize */ \ .tp_basicsize = sizeof(cxoVar), \
0, /* tp_itemsize */ \ .tp_dealloc = (destructor) cxoVar_free, \
(destructor) cxoVar_free, /* tp_dealloc */ \ .tp_repr = (reprfunc) cxoVar_repr, \
0, /* tp_print */ \ .tp_flags = Py_TPFLAGS_DEFAULT, \
0, /* tp_getattr */ \ .tp_methods = cxoVarMethods, \
0, /* tp_setattr */ \ .tp_members = cxoVarMembers, \
0, /* tp_compare */ \ .tp_getset = cxoVarCalcMembers \
(reprfunc) cxoVar_repr, /* tp_repr */ \
0, /* tp_as_number */ \
0, /* tp_as_sequence */ \
0, /* tp_as_mapping */ \
0, /* tp_hash */ \
0, /* tp_call */ \
0, /* tp_str */ \
0, /* tp_getattro */ \
0, /* tp_setattro */ \
0, /* tp_as_buffer */ \
Py_TPFLAGS_DEFAULT, /* tp_flags */ \
0, /* tp_doc */ \
0, /* tp_traverse */ \
0, /* tp_clear */ \
0, /* tp_richcompare */ \
0, /* tp_weaklistoffset */ \
0, /* tp_iter */ \
0, /* tp_iternext */ \
cxoVarMethods, /* tp_methods */ \
cxoVarMembers, /* tp_members */ \
cxoVarCalcMembers /* tp_getset */ \
}; };
DECLARE_VARIABLE_TYPE(cxoPyTypeBfileVar, BFILE) DECLARE_VARIABLE_TYPE(cxoPyTypeBfileVar, BFILE)
@ -812,4 +791,3 @@ static PyObject *cxoVar_repr(cxoVar *var)
Py_DECREF(value); Py_DECREF(value);
return result; return result;
} }

1
src/cxoVarType.c
View File

@ -294,4 +294,3 @@ cxoVarType *cxoVarType_fromPythonValue(PyObject *value, int *isArray,
*size = cxoVarType_calculateSize(value, transformNum); *size = cxoVarType_calculateSize(value, transformNum);
return &cxoAllVarTypes[transformNum]; return &cxoAllVarTypes[transformNum];
} }