mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Cleaned up/simplified error-handling:

Browse source 
- DistutilsOptionError is now documented as it's actually used, ie.
    to indicate bogus option values (usually user options, eg. from
    the command-line)
  - added DistutilsSetupError to indicate errors that definitely arise
    in the setup script
  - got rid of DistutilsValueError, and changed all usage of it to
    either DistutilsSetupError or ValueError as appropriate
  - simplified a bunch of option get/set methods in Command and
    Distribution classes -- just pass on AttributeError most of
    the time, rather than turning it into something else
This commit is contained in:
Greg Ward 2000-04-15 22:15:07 +00:00
parent 4a3dd2dcc2
commit 02a1a2b077
7 changed files with 52 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/distutils/dist.py
View file

@ -152,7 +152,7 @@ class Distribution:
if hasattr (self, key):
setattr (self, key, val)
else:
raise DistutilsOptionError, \
raise DistutilsSetupError, \
"invalid distribution option '%s'" % key
# __init__ ()
@ -447,27 +447,18 @@ class Distribution:
def get_option (self, option):
"""Return the value of a distribution option. Raise
DistutilsOptionError if 'option' is not known."""
try:
return getattr (self, opt)
except AttributeError:
raise DistutilsOptionError, \
"unknown distribution option %s" % option
AttributeError if 'option' is not known."""
return getattr (self, opt)
def get_options (self, *options):
"""Return (as a tuple) the values of several distribution
options. Raise DistutilsOptionError if any element of
options. Raise AttributeError if any element of
'options' is not known."""
values = []
try:
for opt in options:
values.append (getattr (self, opt))
except AttributeError, name:
raise DistutilsOptionError, \
"unknown distribution option %s" % name
for opt in options:
values.append (getattr (self, opt))
return tuple (values)
@ -498,17 +489,12 @@ class Distribution:
def get_command_option (self, command, option):
"""Create a command object for 'command' if necessary, ensure that
its option values are all set to their final values, and return
the value of its 'option' option. Raise DistutilsOptionError if
the value of its 'option' option. Raise AttributeError if
'option' is not known for that 'command'."""
cmd_obj = self.find_command_obj (command)
cmd_obj.ensure_ready ()
return cmd_obj.get_option (option)
try:
return getattr (cmd_obj, option)
except AttributeError:
raise DistutilsOptionError, \
"command %s: no such option %s" % (command, option)
def get_command_options (self, command, *options):
@ -521,12 +507,8 @@ class Distribution:
cmd_obj = self.find_command_obj (command)
cmd_obj.ensure_ready ()
values = []
try:
for opt in options:
values.append (getattr (cmd_obj, option))
except AttributeError, name:
raise DistutilsOptionError, \
"command %s: no such option %s" % (command, name)
for opt in options:
values.append (getattr (cmd_obj, option))
return tuple (values)