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

Class File not transforms relative paths

Browse Source 
The code from function transform in class UserStyleSheet is now migrated to
class File.
This commit is contained in:
Lamar Pavel 2015-05-26 12:38:04 +02:00
parent ad7920dda1
commit c54c637ccc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/config/configtypes.py
View File

@ -802,7 +802,13 @@ class File(BaseType):
def transform(self, value): def transform(self, value):
if not value: if not value:
return None return None
return os.path.expanduser(value) value = os.path.expanduser(value)
if not os.path.isabs(value):
if standarddir.config():
abspath = os.path.join(standarddir.config(), value)
if os.path.isfile(abspath):
return abspath
return value
def validate(self, value): def validate(self, value):
if not value: if not value:
@ -1155,13 +1161,8 @@ class UserStyleSheet(File):
def transform(self, value): def transform(self, value):
if not value: if not value:
return None return None
path = os.path.expandvars(value) path = super().transform(value)
path = os.path.expanduser(path) path = os.path.expandvars(path)
if not os.path.isabs(path):
if standarddir.config():
abspath = os.path.join(standarddir.config(), path)
if os.path.isfile(abspath):
path = abspath
if os.path.isabs(path): if os.path.isabs(path):
return QUrl.fromLocalFile(path) return QUrl.fromLocalFile(path)
else: else: