summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2012-02-21 11:59:34 (GMT)
committerPetri Lehtinen <petri@digip.org>2012-02-21 11:59:40 (GMT)
commit8b24506534860b6c1cfa7f53c40113d502f4c78f (patch)
tree6ee951cd4c9865f21a3323be82ff94bb18a8b727 /Misc
parent307da2b07040d0eea179cf989e3de8d9e75a9b2f (diff)
parent4fe85abab9f0188733e654a72353217b43f95920 (diff)
downloadcpython-8b24506534860b6c1cfa7f53c40113d502f4c78f.zip
cpython-8b24506534860b6c1cfa7f53c40113d502f4c78f.tar.gz
cpython-8b24506534860b6c1cfa7f53c40113d502f4c78f.tar.bz2
Merge branch '3.2'
Closes #8033.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 760ac53..2e37b41 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -242,6 +242,7 @@ Konrad Delong
Erik Demaine
John Dennis
Roger Dev
+Philippe Devalkeneer
Raghuram Devarakonda
Caleb Deveraux
Catherine Devlin
diff --git a/Misc/NEWS b/Misc/NEWS
index a399b61..2a43734 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -479,6 +479,9 @@ Core and Builtins
Library
-------
+- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions
+ on 32-bit architectures. Initial patch by Philippe Devalkeneer.
+
- HTMLParser is now able to handle slashes in the start tag.
- Issue #13641: Decoding functions in the base64 module now accept ASCII-only