rename FileOption to FilenameOption
python 3 support
This commit is contained in:
@@ -425,7 +425,7 @@ class Option(BaseOption):
|
||||
self._validate(_value)
|
||||
except ValueError as err:
|
||||
raise ValueError(_('invalid value for option {0}: {1}'
|
||||
'').format(self._name, err.message))
|
||||
'').format(self._name, err))
|
||||
try:
|
||||
# valid with self._validator
|
||||
val_validator(_value)
|
||||
@@ -435,7 +435,7 @@ class Option(BaseOption):
|
||||
self._second_level_validation(_value)
|
||||
except ValueError as err:
|
||||
msg = _("invalid value for option {0}: {1}").format(
|
||||
self._name, err.message)
|
||||
self._name, err)
|
||||
if self._warnings_only:
|
||||
warnings.warn_explicit(ValueWarning(msg, self),
|
||||
ValueWarning,
|
||||
@@ -1096,7 +1096,7 @@ class URLOption(DomainnameOption):
|
||||
raise ValueError(_('invalid url, should ends with filename'))
|
||||
|
||||
|
||||
class FileOption(Option):
|
||||
class FilenameOption(Option):
|
||||
__slots__ = tuple()
|
||||
_opt_type = 'file'
|
||||
path_re = re.compile(r"^[a-zA-Z0-9\-\._~/+]+$")
|
||||
|
Reference in New Issue
Block a user