traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[from 1999-11-04] 

Bunch of little bug fixes that appeared in building non-packagized
distributions.  Mainly:
  - brain-slip typo in 'get_package_dir()'
  - don't try to os.path.join() an empty path tuple -- it doesn't like it
  - more type-safety in 'build_module()'
This commit is contained in:
Greg Ward 1999-12-03 16:18:56 +00:00
parent 0c3e4b6ca1
commit 631e6a0c07
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/distutils/command/build_py.py
View File

@ -93,12 +93,15 @@ class BuildPy (Command):
if type (package) is StringType: if type (package) is StringType:
path = string.split (package, '.') path = string.split (package, '.')
elif type (package) in (TupleType, ListType): elif type (package) in (TupleType, ListType):
path = list (path) path = list (package)
else: else:
raise TypeError, "'package' must be a string, list, or tuple" raise TypeError, "'package' must be a string, list, or tuple"
if not self.package_dir: if not self.package_dir:
return apply (os.path.join, path) if path:
return apply (os.path.join, path)
else:
return ''
else: else:
tail = [] tail = []
while path: while path:
@ -113,7 +116,10 @@ class BuildPy (Command):
else: else:
# arg! everything failed, we might as well have not even # arg! everything failed, we might as well have not even
# looked in package_dir -- oh well # looked in package_dir -- oh well
return apply (os.path.join, tail) if tail:
return apply (os.path.join, tail)
else:
return ''
# get_package_dir () # get_package_dir ()
@ -134,7 +140,7 @@ class BuildPy (Command):
"but is not a directory") % package_dir "but is not a directory") % package_dir
# Require __init__.py for all but the "root package" # Require __init__.py for all but the "root package"
if package != "": if package:
init_py = os.path.join (package_dir, "__init__.py") init_py = os.path.join (package_dir, "__init__.py")
if not os.path.isfile (init_py): if not os.path.isfile (init_py):
self.warn (("package init file '%s' not found " + self.warn (("package init file '%s' not found " +
@ -233,11 +239,14 @@ class BuildPy (Command):
if type (package) is StringType: if type (package) is StringType:
package = string.split (package, '.') package = string.split (package, '.')
elif type (package) not in (ListType, TupleType):
raise TypeError, \
"'package' must be a string (dot-separated), list, or tuple"
# Now put the module source file into the "build" area -- this is # Now put the module source file into the "build" area -- this is
# easy, we just copy it somewhere under self.build_dir (the build # easy, we just copy it somewhere under self.build_dir (the build
# directory for Python source). # directory for Python source).
outfile_path = package outfile_path = list (package)
outfile_path.append (module + ".py") outfile_path.append (module + ".py")
outfile_path.insert (0, self.build_dir) outfile_path.insert (0, self.build_dir)
outfile = apply (os.path.join, outfile_path) outfile = apply (os.path.join, outfile_path)