rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Differentiate exceptions; remove obsolete test

Browse Source 
In function File.validate the try-except block has been re-written to
differentiate raised errors.

In function File.transform there was a check for validity of the file path that
is alraedy performed by File.validate under the same conditions. This check has
been removed.
This commit is contained in:
Lamar Pavel 2015-06-08 12:53:59 +02:00
parent 5bacbc9d38
commit 0e50760b70
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qutebrowser/config/configtypes.py
View File

@ -805,10 +805,9 @@ class File(BaseType):
value = os.path.expanduser(value)
value = os.path.expandvars(value)
if not os.path.isabs(value):
if standarddir.config() is not None:
abspath = os.path.join(standarddir.config(), value)
if os.path.isfile(abspath):
return abspath
cfgdir = standarddir.config()
if cfgdir is not None:
return os.path.join(cfgdir, value)
return value
def validate(self, value):
@ -821,16 +820,19 @@ class File(BaseType):
try:
if not os.path.isabs(value):
cfgdir = standarddir.config()
if cfgdir is not None and os.path.isfile(
os.path.join(cfgdir, value)):
if cfgdir is None:
raise configexc.ValidationError(
value, "must be an absolute path when not using a "
"config directory!")
elif not os.path.isfile(os.path.join(cfgdir, value)):
raise configexc.ValidationError(
value, "must be a valid path relative to the config "
"directory!")
else:
return
raise configexc.ValidationError(
value, "must be an absolute path when not using a config "
"directory!")
elif not os.path.isfile(value):
raise configexc.ValidationError(
value, "must be a valid path relative to the config "
"directory!")
value, "must be a valid file!")
except UnicodeEncodeError as e:
raise configexc.ValidationError(value, e)