[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r62172:b0543cd42158
Date: 2013-03-07 10:43 +0100
http://bitbucket.org/pypy/pypy/changeset/b0543cd42158/

Log:    merge heads

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -472,9 +472,8 @@
 
     def _begin(self):
         statement = c_void_p()
-        next_char = c_char_p()
         ret = sqlite.sqlite3_prepare_v2(self._db, self.__begin_statement, -1,
-                                        byref(statement), next_char)
+                                        byref(statement), None)
         try:
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
@@ -497,9 +496,8 @@
                 obj._reset()
 
         statement = c_void_p()
-        next_char = c_char_p()
         ret = sqlite.sqlite3_prepare_v2(self._db, b"COMMIT", -1,
-                                        byref(statement), next_char)
+                                        byref(statement), None)
         try:
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
@@ -527,9 +525,8 @@
                 cursor._reset = True
 
         statement = c_void_p()
-        next_char = c_char_p()
         ret = sqlite.sqlite3_prepare_v2(self._db, b"ROLLBACK", -1,
-                                        byref(statement), next_char)
+                                        byref(statement), None)
         try:
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit