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

usertypes: Move QSS_FONT_REGEX to class.

Browse Source
This commit is contained in:
Florian Bruhin 2014-08-05 17:05:13 +02:00
parent ec1b31a61c
commit 0e645d9361
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qutebrowser/config/conftypes.py
View File

@ -32,23 +32,6 @@ import qutebrowser.commands.utils as cmdutils
from qutebrowser.utils.misc import get_standard_dir from qutebrowser.utils.misc import get_standard_dir
QSS_FONT_REGEX = re.compile(r"""
^(
(
# style
(?P<style>normal|italic|oblique) |
# weight (named | 100..900)
(
(?P<weight>[123456789]00) |
(?P<namedweight>normal|bold)
) |
# size (<float>pt | <int>px)
(?P<size>[0-9]+((\.[0-9]+)?[pP][tT]|[pP][xX]))
)\ # size/weight/style are space-separated
)* # 0-inf size/weight/style tags
(?P<family>[A-Za-z, "]*)$ # mandatory font family""", re.VERBOSE)
class ValidationError(ValueError): class ValidationError(ValueError):
"""Exception raised when a value for a config type was invalid. """Exception raised when a value for a config type was invalid.
@ -658,6 +641,21 @@ class Font(BaseType):
"""Base class for a font value.""" """Base class for a font value."""
typestr = 'font' typestr = 'font'
font_regex = re.compile(r"""
^(
(
# style
(?P<style>normal|italic|oblique) |
# weight (named | 100..900)
(
(?P<weight>[123456789]00) |
(?P<namedweight>normal|bold)
) |
# size (<float>pt | <int>px)
(?P<size>[0-9]+((\.[0-9]+)?[pP][tT]|[pP][xX]))
)\ # size/weight/style are space-separated
)* # 0-inf size/weight/style tags
(?P<family>[A-Za-z, "]*)$ # mandatory font family""", re.VERBOSE)
def validate(self, value): def validate(self, value):
if not value: if not value:
@ -665,7 +663,7 @@ class Font(BaseType):
return return
else: else:
raise ValidationError(value, "may not be empty!") raise ValidationError(value, "may not be empty!")
if not QSS_FONT_REGEX.match(value): if not self.font_regex.match(value):
raise ValidationError(value, "must be a valid font") raise ValidationError(value, "must be a valid font")
@ -686,7 +684,7 @@ class QtFont(Font):
'bold': QFont.Bold, 'bold': QFont.Bold,
} }
font = QFont() font = QFont()
match = QSS_FONT_REGEX.match(value) match = self.font_regex.match(value)
style = match.group('style') style = match.group('style')
weight = match.group('weight') weight = match.group('weight')
namedweight = match.group('weight') namedweight = match.group('weight')