[pypy-commit] pypy stdlib-2.7.13: update sqlite3

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stdlib-2.7.13
Changeset: r89158:79cf94d1d4ec
Date: 2016-12-18 19:10 +0100
http://bitbucket.org/pypy/pypy/changeset/79cf94d1d4ec/

Log:	update sqlite3

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -368,12 +368,16 @@
     def __call__(self, sql):
         return self._statement_cache.get(sql)
 
-    def cursor(self, factory=None):
+    def _default_cursor_factory(self):
+        return Cursor(self)
+
+    def cursor(self, factory=_default_cursor_factory):
         self._check_thread()
         self._check_closed()
-        if factory is None:
-            factory = Cursor
         cur = factory(self)
+        if not issubclass(type(cur), Cursor):
+            raise TypeError("factory must return a cursor, not %s"
+                            % (type(cur).__name__,))
         if self.row_factory is not None:
             cur.row_factory = self.row_factory
         return cur
@@ -414,7 +418,8 @@
         if not self._in_transaction:
             return
 
-        self.__do_all_statements(Statement._reset, False)
+        # the following line is removed for compatibility with 2.7.13:
+        #    self.__do_all_statements(Statement._reset, False)
 
         statement_star = _ffi.new('sqlite3_stmt **')
         ret = _lib.sqlite3_prepare_v2(self._db, b"COMMIT", -1,
@@ -546,7 +551,7 @@
     @_check_thread_wrap
     @_check_closed_wrap
     def create_collation(self, name, callback):
-        name = name.upper()
+        name = str.upper(name)
         if not all(c in string.ascii_uppercase + string.digits + '_' for c in name):
             raise ProgrammingError("invalid character in collation name")