From e4a5b92ab40b119d6816c10944f1679bfe4d4be0 Mon Sep 17 00:00:00 2001 From: "benjamin.peterson" Date: Wed, 12 Aug 2009 18:39:44 +0000 Subject: [PATCH] Merged revisions 74356-74357 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74356 | benjamin.peterson | 2009-08-12 13:11:03 -0500 (Wed, 12 Aug 2009) | 1 line fix typo in c++ ifdef ........ r74357 | benjamin.peterson | 2009-08-12 13:18:03 -0500 (Wed, 12 Aug 2009) | 1 line search through db.h in binary #6680 ........ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74358 6015fed2-1504-0410-9fe1-9d1591cc4771 --- Modules/socketmodule.h | 2 +- setup.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h index ee525153fb..65bc8ad52b 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -192,7 +192,7 @@ typedef struct { #define PySocketModule_ImportModuleAndAPI() PyCapsule_Import(PySocket_CAPSULE_NAME, 1) -#ifdef __cpluplus +#ifdef __cplusplus } #endif #endif /* !Py__SOCKET_H */ diff --git a/setup.py b/setup.py index c42416edf8..e4bad6f615 100644 --- a/setup.py +++ b/setup.py @@ -725,17 +725,17 @@ class PyBuildExt(build_ext): f = os.path.join(d, "db.h") if db_setup_debug: print("db: looking for db.h in", f) if os.path.exists(f): - f = open(f).read() - m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f) + f = open(f, "rb").read() + m = re.search(br"#define\WDB_VERSION_MAJOR\W(\d+)", f) if m: db_major = int(m.group(1)) - m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f) + m = re.search(br"#define\WDB_VERSION_MINOR\W(\d+)", f) db_minor = int(m.group(1)) db_ver = (db_major, db_minor) # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug if db_ver == (4, 6): - m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f) + m = re.search(br"#define\WDB_VERSION_PATCH\W(\d+)", f) db_patch = int(m.group(1)) if db_patch < 21: print("db.h:", db_ver, "patch", db_patch, -- 2.11.4.GIT