[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r62990:d60870d842a8
Date: 2013-04-03 22:54 +0200
http://bitbucket.org/pypy/pypy/changeset/d60870d842a8/

Log:	merge

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -1266,6 +1266,7 @@
         try:
             item = self._item
         except AttributeError:
+            self._reset()
             raise StopIteration
         del self._item
 
@@ -1275,8 +1276,6 @@
             raise self.__con._get_exception(ret)
         elif ret == _lib.SQLITE_ROW:
             self._readahead(cursor)
-        else:
-            self._reset()
 
         return item