From: Petri Lehtinen <petri@digip.org>
Date: Tue, 21 Feb 2012 11:59:34 +0000 (+0200)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a1~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b24506534860b6c1cfa7f53c40113d502f4c78f;p=python

Merge branch '3.2'

Closes #8033.
---

8b24506534860b6c1cfa7f53c40113d502f4c78f
diff --cc Misc/NEWS
index a399b61ae7,5d2b178c66..2a43734ef2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -479,14 -121,11 +479,17 @@@ Core and Builtin
  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
 +  unicode strings.  Patch by Catalin Iacob.
 +
 +- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a
 +  new importlib.invalidate_caches() function.
 +
  - Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in
    SimpleXMLRPCServer upon malformed POST request.