[Python-checkins] CVS: python/dist/src/Lib/distutils/command build_py.py,1.34,1.34.6.1

2002年2月19日 06:15:42 -0800

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv12046/Lib/distutils/command
Modified Files:
 Tag: release22-maint
	build_py.py 
Log Message:
Backport theller's checkin of revision 1.35:
package_dir must be converted from the distutils path conventions to
local conventions before being used by build_py.
Fixes SF bug #509288, probably a candidate for 2.2.1
Index: build_py.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_py.py,v
retrieving revision 1.34
retrieving revision 1.34.6.1
diff -C2 -d -r1.34 -r1.34.6.1
*** build_py.py	6 Dec 2001 20:59:17 -0000	1.34
--- build_py.py	19 Feb 2002 14:15:40 -0000	1.34.6.1
***************
*** 13,16 ****
--- 13,17 ----
 from distutils.core import Command
 from distutils.errors import *
+ from distutils.util import convert_path
 
 
***************
*** 51,55 ****
 self.packages = self.distribution.packages
 self.py_modules = self.distribution.py_modules
! self.package_dir = self.distribution.package_dir
 
 # Ick, copied straight from install_lib.py (fancy_getopt needs a
--- 52,59 ----
 self.packages = self.distribution.packages
 self.py_modules = self.distribution.py_modules
! self.package_dir = {}
! if self.distribution.package_dir:
! for name, path in self.distribution.package_dir.items():
! self.package_dir[name] = convert_path(path)
 
 # Ick, copied straight from install_lib.py (fancy_getopt needs a