Author: Maciej Fijalkowski <[email protected]>
Branch: release-2.0-beta2
Changeset: r63059:61273f6466dc
Date: 2013-04-05 14:28 +0200
http://bitbucket.org/pypy/pypy/changeset/61273f6466dc/
Log: merge default
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -1080,7 +1080,6 @@
next_row = self.__next_row
except AttributeError:
self.__statement._reset()
- self.__statement = None
raise StopIteration
del self.__next_row
diff --git a/pypy/module/test_lib_pypy/test_sqlite3.py
b/pypy/module/test_lib_pypy/test_sqlite3.py
--- a/pypy/module/test_lib_pypy/test_sqlite3.py
+++ b/pypy/module/test_lib_pypy/test_sqlite3.py
@@ -210,3 +210,9 @@
gc.collect()
got = (val[0], val[1], val[2], val[3])
assert got == ('b', 'l', 'o', 'b')
+
+def test_description_after_fetchall():
+ con = _sqlite3.connect(":memory:")
+ cur = con.cursor()
+ cur.execute("select 42").fetchall()
+ assert cur.description is not None
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
