mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
Cleaned up/simplified error-handling:
- 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:
parent
4a3dd2dcc2
commit
02a1a2b077
7 changed files with 52 additions and 79 deletions
|
@ -40,16 +40,16 @@ def native_path (pathname):
|
|||
using the current directory separator. Needed because filenames in
|
||||
the setup script are always supplied in Unix style, and have to be
|
||||
converted to the local convention before we can actually use them in
|
||||
the filesystem. Raises DistutilsValueError if 'pathname' is
|
||||
the filesystem. Raises ValueError if 'pathname' is
|
||||
absolute (starts with '/') or contains local directory separators
|
||||
(unless the local separator is '/', of course)."""
|
||||
|
||||
if pathname[0] == '/':
|
||||
raise DistutilsValueError, "path '%s' cannot be absolute" % pathname
|
||||
raise ValueError, "path '%s' cannot be absolute" % pathname
|
||||
if pathname[-1] == '/':
|
||||
raise DistutilsValueError, "path '%s' cannot end with '/'" % pathname
|
||||
raise ValueError, "path '%s' cannot end with '/'" % pathname
|
||||
if os.sep != '/' and os.sep in pathname:
|
||||
raise DistutilsValueError, \
|
||||
raise ValueError, \
|
||||
"path '%s' cannot contain '%c' character" % \
|
||||
(pathname, os.sep)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue