Imported Upstream version 0.4.8

diff --git a/PKG-INFO b/PKG-INFO
index a42bc2351fa30154837f42cb9dfc3b44843066a0..c373185ff0297151b9deeeeaf614142c8be32324 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pysqlite3
-Version: 0.4.7
+Version: 0.4.8
 Summary: DB-API 2.0 interface for Sqlite 3.x
 Home-page: https://github.com/coleifer/pysqlite3
 Author: Charles Leifer

diff --git a/pysqlite3.egg-info/PKG-INFO b/pysqlite3.egg-info/PKG-INFO
index a42bc2351fa30154837f42cb9dfc3b44843066a0..c373185ff0297151b9deeeeaf614142c8be32324 100644 (file)
--- a/pysqlite3.egg-info/PKG-INFO
+++ b/pysqlite3.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pysqlite3
-Version: 0.4.7
+Version: 0.4.8
 Summary: DB-API 2.0 interface for Sqlite 3.x
 Home-page: https://github.com/coleifer/pysqlite3
 Author: Charles Leifer

diff --git a/setup.py b/setup.py
index 9efe6375821f32a3bfa938f4f01adb585f48d135..89e2dffdef226a6adec94bbd66443f840bf291dd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from setuptools import Extension
 # If you need to change anything, it should be enough to change setup.cfg.
 
 PACKAGE_NAME = 'pysqlite3'
-VERSION = '0.4.7'
+VERSION = '0.4.8'
 
 # define sqlite sources
 sources = [os.path.join('src', source)

diff --git a/src/connection.c b/src/connection.c
index 7b1bd1203d0ef6b4095743f10e0b5cec99123f92..b6154c371d83123d8efc04964a947359da465797 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -722,7 +722,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
 
     if (*aggregate_instance == NULL) {
-        *aggregate_instance = _PyObject_CallNoArg(aggregate_class);
+        *aggregate_instance = PyObject_CallObject(aggregate_class, NULL);
 
         if (PyErr_Occurred()) {
             *aggregate_instance = 0;
@@ -1172,7 +1172,7 @@ static int _progress_handler(void* user_arg)
     PyGILState_STATE gilstate;
 
     gilstate = PyGILState_Ensure();
-    ret = _PyObject_CallNoArg((PyObject*)user_arg);
+    ret = PyObject_CallObject((PyObject*)user_arg, NULL);
 
     if (!ret) {
         if (_pysqlite_enable_callback_tracebacks) {

diff --git a/src/prepare_protocol.c b/src/prepare_protocol.c
index f2c85f9af6cb68a98dd1210ae4269f636d202bfb..7d074e7753fd2328f5421e1d7273217f0d5f014b 100644 (file)
--- a/src/prepare_protocol.c
+++ b/src/prepare_protocol.c
@@ -77,7 +77,10 @@ PyTypeObject pysqlite_PrepareProtocolType= {
 
 extern int pysqlite_prepare_protocol_setup_types(void)
 {
+    int rc;
     pysqlite_PrepareProtocolType.tp_new = PyType_GenericNew;
-    Py_TYPE(&pysqlite_PrepareProtocolType)= &PyType_Type;
-    return PyType_Ready(&pysqlite_PrepareProtocolType);
+    //Py_TYPE(&pysqlite_PrepareProtocolType)= &PyType_Type;
+    rc = PyType_Ready(&pysqlite_PrepareProtocolType);
+    return rc;
+    //return PyType_Ready(&pysqlite_PrepareProtocolType);
 }