summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-14 01:24:44 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-14 01:24:44 (GMT)
commit380532117c2547bb0dedf6f85efa66d18a9abb88 (patch)
tree33e690cd422859aa0272fbe0a9d1f163e77fbaf2 /Lib/distutils
parent8a78cadf561ea67649a84d9b4055dd4c24e2e0ba (diff)
downloadcpython-380532117c2547bb0dedf6f85efa66d18a9abb88.zip
cpython-380532117c2547bb0dedf6f85efa66d18a9abb88.tar.gz
cpython-380532117c2547bb0dedf6f85efa66d18a9abb88.tar.bz2
Merged revisions 59465-59487 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59467 | georg.brandl | 2007-12-11 17:32:49 +0100 (Tue, 11 Dec 2007) | 2 lines Add another GHOP contributor. ........ r59468 | kurt.kaiser | 2007-12-11 20:35:12 +0100 (Tue, 11 Dec 2007) | 3 lines IDLE_tabbedpages.071101.patch Tal Einat Cosmetic changes, one bug. Remove tabpage.py, replaced by tabbedpages.py ........ r59471 | gerhard.haering | 2007-12-11 22:07:40 +0100 (Tue, 11 Dec 2007) | 9 lines Forward-port of commit 59184. - Backported a workaround for a bug in SQLite 3.2.x/3.3.x versions where a statement recompilation with no bound parameters lead to a segfault - Backported a fix necessary because of an SQLite API change in version 3.5. This prevents segfaults when executing empty queries, like our test suite does ........ r59475 | christian.heimes | 2007-12-12 19:09:06 +0100 (Wed, 12 Dec 2007) | 1 line Fixed a nasty problem in the xxmodule.c ........ r59478 | raymond.hettinger | 2007-12-13 01:08:37 +0100 (Thu, 13 Dec 2007) | 1 line Fix bug 1604. deque.__init__() did not clear existing contents like list.__init__. Not a backport candidate. ........ r59480 | alexandre.vassalotti | 2007-12-13 18:58:23 +0100 (Thu, 13 Dec 2007) | 2 lines Fix issue #1313119: urlparse "caches" parses regardless of encoding ........ r59482 | christian.heimes | 2007-12-13 20:23:16 +0100 (Thu, 13 Dec 2007) | 1 line Fixed bug #1613: Makefile's VPATH feature is broken ........ r59484 | guido.van.rossum | 2007-12-13 21:50:10 +0100 (Thu, 13 Dec 2007) | 3 lines Patch #1608. Someone with access to autoconf 2.61 or higher needs to run it and check in the resulting configure file. ........ r59485 | thomas.heller | 2007-12-13 22:20:29 +0100 (Thu, 13 Dec 2007) | 1 line Ran autoconf. ........ r59486 | raymond.hettinger | 2007-12-13 23:55:52 +0100 (Thu, 13 Dec 2007) | 1 line Simplify implementation of __replace__() ........ r59487 | raymond.hettinger | 2007-12-14 00:52:59 +0100 (Fri, 14 Dec 2007) | 1 line Small speedup ........
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/sysconfig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 191f3d1..c450cd5 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -32,7 +32,7 @@ if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
# building an extension with an un-installed Python, so we use
# different (hard-wired) directories.
python_build = os.path.isfile(os.path.join(project_base, "Modules",
- "Setup.dist"))
+ "Setup.local"))
def get_python_version():
"""Return a string containing the major and minor Python version,