[Python-checkins] cpython (merge 3.2 -> 3.3): Issue #5033: Fix building of the sqlite3 extension module

[petri.lehtinen]

http://hg.python.org/cpython/rev/c613eb716c8e
changeset:   82345:c613eb716c8e
branch:      3.3
parent:      82340:629af342b189
parent:      82344:73d5dd480558
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Feb 23 17:24:00 2013 +0100
summary:
  Issue #5033: Fix building of the sqlite3 extension module

files:
  Misc/ACKS |  1 +
  Misc/NEWS |  3 +++
  setup.py  |  2 +-
  3 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -908,6 +908,7 @@
 Justin Peel
 Marcel van der Peijl
 Berker Peksag
+Andreas Pelme
 Steven Pemberton
 Bo Peng
 Santiago Peresón
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -694,6 +694,9 @@
 Build
 -----
 
+- Issue #5033: Fix building of the sqlite3 extension module when the
+  SQLite library version has "beta" in it. Patch by Andreas Pelme.
+
 - Issue #17228: Fix building without pymalloc.
 
 - Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1062,7 +1062,7 @@
                 with open(f) as file:
                     incf = file.read()
                 m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
+                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
                 if m:
                     sqlite_version = m.group(1)
                     sqlite_version_tuple = tuple([int(x)

-- 
Repository URL: http://hg.python.org/cpython