Mercurial > cpython-lru_cache-weakref

diff setup.py @ 55573:5c8b2238a2f5 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ........
author Benjamin Peterson <benjamin@python.org>
date Wed, 12 Aug 2009 18:39:44 +0000
parents 56a276396e15
children 4e7f6bc810b3
line wrap: on
line diff
--- a/setup.py	Thu Aug 06 21:01:42 2009 +0000
+++ b/setup.py	Wed Aug 12 18:39:44 2009 +0000
@@ -725,17 +725,17 @@
                 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,