From b61d801adbb7dd13ed1f2706fe537cae970bcfa6 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 11 May 2008 23:39:04 +0000
Subject: [PATCH] Put Lib/lib-old back on to sys.path for module renames.

---
 Makefile.pre.in    | 4 +++-
 Misc/NEWS          | 2 ++
 Modules/Setup.dist | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index daae2baf68..a4f362792f 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 f843f2a160..230632e02e 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 d87e3ba63d..ee361cfbfb 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)
 
 
-- 
2.40.0