Put Lib/lib-old back on to sys.path for module renames.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index daae2baf683cc5d50f84cb0dae7afa34d1ff6d4b..a4f362792fd437295e10310e1b03ab4c77841bde 100644 (file)
--- 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 f843f2a1601a755e9e2ed58381a6add221edbd29..230632e02e5698518683288b0535c5aec3300045 100644 (file)
--- 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 d87e3ba63d2cd88c17ac01da4a86d54a11b686c9..ee361cfbfba0b4a4d7e800f8f822f61cf223b53c 100644 (file)
--- 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)