Merged requested to merge bitbucket/merged-pr-23 into branch/default
Created originally on Bitbucket by dripton (David Ripton)
Was already merged in Bitbucket before import, marked as merged by the import user
Source changeset not longer availableat the time of import. Commit listwill look empty
4 commits of trivial cleanups to lib_pypy/_sqlite3.py, a comment to comply with the pysqlite license, a test based on the test case in issue996, and a one-line fix for issue996. lib-python/2.7/test/test_sqlite.py still passes after the change.
Added an assert to the new test, which previously just looked for exceptions.