Author: David Schneider <david.schnei...@picle.org>
Branch:
Changeset: r63068:e06dbffccdc6
Date: 2013-04-05 19:43 +0200
http://bitbucket.org/pypy/pypy/changeset/e06dbffccdc6/
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
@@ -29,7 +29,6 @@
import string
import sys
import weakref
-import array
from threading import _get_ident as _thread_get_ident
try:
from __pypy__ import newlist_hint
@@ -959,11 +958,7 @@
elif typ == _lib.SQLITE_BLOB:
blob =
_lib.sqlite3_column_blob(self.__statement._statement, i)
blob_len =
_lib.sqlite3_column_bytes(self.__statement._statement, i)
- # make a copy of the data into an array, in order to get
- # a read-write buffer in the end, and one that own the
- # memory for a more predictable length of time than 'blob'
- copy = array.array("c", _ffi.buffer(blob, blob_len))
- val = _BLOB_TYPE(copy)
+ val = _BLOB_TYPE(_ffi.buffer(blob, blob_len)[:])
row.append(val)
return tuple(row)
@@ -1391,7 +1386,7 @@
elif typ == _lib.SQLITE_BLOB:
blob = _lib.sqlite3_value_blob(params[i])
blob_len = _lib.sqlite3_value_bytes(params[i])
- val = _BLOB_TYPE(_ffi.buffer(blob, blob_len))
+ val = _BLOB_TYPE(_ffi.buffer(blob, blob_len)[:])
else:
raise NotImplementedError
_params.append(val)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
