mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Renamed 'modules' option to 'py_modules', for consistency with Distribution

Browse source 
(and in order to generate a more sensible error message cleanly).
This commit is contained in:
Greg Ward 2000-06-04 13:42:52 +00:00
parent 841b9fbebb
commit 6f980b5936
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/distutils/command/build_py.py
View file

@ -26,7 +26,7 @@ class build_py (Command):
def initialize_options (self): def initialize_options (self):
self.build_lib = None self.build_lib = None
self.modules = None self.py_modules = None
self.package = None self.package = None
self.package_dir = None self.package_dir = None
self.force = None self.force = None
@ -39,7 +39,7 @@ class build_py (Command):
# Get the distribution options that are aliases for build_py # Get the distribution options that are aliases for build_py
# options -- list of packages and list of modules. # options -- list of packages and list of modules.
self.packages = self.distribution.packages self.packages = self.distribution.packages
self.modules = self.distribution.py_modules self.py_modules = self.distribution.py_modules
self.package_dir = self.distribution.package_dir self.package_dir = self.distribution.package_dir
@ -62,7 +62,7 @@ class build_py (Command):
# installing). # installing).
# Two options control which modules will be installed: 'packages' # Two options control which modules will be installed: 'packages'
# and 'modules'. The former lets us work with whole packages, not # and 'py_modules'. The former lets us work with whole packages, not
# specifying individual modules at all; the latter is for # specifying individual modules at all; the latter is for
# specifying modules one-at-a-time. Currently they are mutually # specifying modules one-at-a-time. Currently they are mutually
# exclusive: you can define one or the other (or neither), but not # exclusive: you can define one or the other (or neither), but not
@ -70,17 +70,17 @@ class build_py (Command):
# Dispose of the two "unusual" cases first: no pure Python modules # Dispose of the two "unusual" cases first: no pure Python modules
# at all (no problem, just return silently), and over-specified # at all (no problem, just return silently), and over-specified
# 'packages' and 'modules' options. # 'packages' and 'py_modules' options.
if not self.modules and not self.packages: if not self.py_modules and not self.packages:
return return
if self.modules and self.packages: if self.py_modules and self.packages:
raise DistutilsOptionError, \ raise DistutilsOptionError, \
"build_py: supplying both 'packages' and 'modules' " + \ "build_py: supplying both 'packages' and 'py_modules' " + \
"options is not allowed" "options is not allowed"
# Now we're down to two cases: 'modules' only and 'packages' only. # Now we're down to two cases: 'py_modules' only and 'packages' only.
if self.modules: if self.py_modules:
self.build_modules () self.build_modules ()
else: else:
self.build_packages () self.build_packages ()
@ -194,7 +194,7 @@ class build_py (Command):
def find_modules (self): def find_modules (self):
"""Finds individually-specified Python modules, ie. those listed by """Finds individually-specified Python modules, ie. those listed by
module name in 'self.modules'. Returns a list of tuples (package, module name in 'self.py_modules'. Returns a list of tuples (package,
module_base, filename): 'package' is a tuple of the path through module_base, filename): 'package' is a tuple of the path through
package-space to the module; 'module_base' is the bare (no package-space to the module; 'module_base' is the bare (no
packages, no dots) module name, and 'filename' is the path to the packages, no dots) module name, and 'filename' is the path to the
@ -218,7 +218,7 @@ class build_py (Command):
# string or empty list, depending on context). Differences: # string or empty list, depending on context). Differences:
# - don't check for __init__.py in directory for empty package # - don't check for __init__.py in directory for empty package
for module in self.modules: for module in self.py_modules:
path = string.split (module, '.') path = string.split (module, '.')
package = tuple (path[0:-1]) package = tuple (path[0:-1])
module_base = path[-1] module_base = path[-1]
@ -251,12 +251,12 @@ class build_py (Command):
def find_all_modules (self): def find_all_modules (self):
"""Compute the list of all modules that will be built, whether """Compute the list of all modules that will be built, whether
they are specified one-module-at-a-time ('self.modules') or they are specified one-module-at-a-time ('self.py_modules') or
by whole packages ('self.packages'). Return a list of tuples by whole packages ('self.packages'). Return a list of tuples
(package, module, module_file), just like 'find_modules()' and (package, module, module_file), just like 'find_modules()' and
'find_package_modules()' do.""" 'find_package_modules()' do."""
if self.modules: if self.py_modules:
modules = self.find_modules () modules = self.find_modules ()
else: else:
modules = [] modules = []