summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-11 23:39:04 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-11 23:39:04 (GMT)
commitb61d801adbb7dd13ed1f2706fe537cae970bcfa6 (patch)
treed6a9de443e5e4aada96170dd956f020a0e482572
parent1fcaa77ac5a9cb09e014f2531a85561b9f7bed8c (diff)
downloadcpython-b61d801adbb7dd13ed1f2706fe537cae970bcfa6.zip
cpython-b61d801adbb7dd13ed1f2706fe537cae970bcfa6.tar.gz
cpython-b61d801adbb7dd13ed1f2706fe537cae970bcfa6.tar.bz2
Put Lib/lib-old back on to sys.path for module renames.
-rw-r--r--Makefile.pre.in4
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/Setup.dist5
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index daae2ba..a4f3627 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -814,7 +814,9 @@ LIBSUBDIRS= lib-tk site-packages test test/output test/data \
lib2to3 lib2to3/fixes lib2to3/pgen2 \
ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
- setuptools setuptools/command setuptools/tests setuptools.egg-info \
+ setuptools setuptools/command setuptools/tests \
+ setuptools.egg-info \
+ lib-old \
curses $(MACHDEPS)
libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
diff --git a/Misc/NEWS b/Misc/NEWS
index f843f2a..230632e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,6 +76,8 @@ Library
Build
-----
+- ``Lib/lib-old`` is now added to sys.path.
+
What's New in Python 2.6 alpha 3?
=================================
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index d87e3ba..ee361cf 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -98,7 +98,10 @@ EXTRAMACHDEPPATH=
# The TKPATH variable is always enabled, to save you the effort.
TKPATH=:lib-tk
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)
+# Path component for old modules.
+OLDPATH=:lib-old
+
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)$(OLDPATH)
PYTHONPATH=$(COREPYTHONPATH)