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

Fix remaining configtypes issues

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-15 19:26:30 +02:00
parent 72d4421ac8
commit dc74a55b84
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qutebrowser/config/configtypes.py
View File

@ -841,7 +841,9 @@ class FontFamily(Font):
return None return None
match = self.font_regex.match(value) match = self.font_regex.match(value)
if not match: # FIXME:conf this used to have "pragma: no cover" if not match: # pragma: no cover
# This should never happen, as the regex always matches everything
# as family.
raise configexc.ValidationError(value, "must be a valid font") raise configexc.ValidationError(value, "must be a valid font")
for group in 'style', 'weight', 'namedweight', 'size': for group in 'style', 'weight', 'namedweight', 'size':
if match.group(group): if match.group(group):
@ -874,7 +876,9 @@ class QtFont(Font):
font.setWeight(QFont.Normal) font.setWeight(QFont.Normal)
match = self.font_regex.match(value) match = self.font_regex.match(value)
if not match: # FIXME:conf this used to have "pragma: no cover" if not match: # pragma: no cover
# This should never happen, as the regex always matches everything
# as family.
raise configexc.ValidationError(value, "must be a valid font") raise configexc.ValidationError(value, "must be a valid font")
style = match.group('style') style = match.group('style')
@ -913,7 +917,7 @@ class Regex(BaseType):
"""A regular expression. """A regular expression.
Attributes: Attributes:
flags: The flags to be used when a regex is passed. flags: The flags to be used when a string is passed.
_regex_type: The Python type of a regex object. _regex_type: The Python type of a regex object.
""" """
@ -965,7 +969,6 @@ class Regex(BaseType):
elif isinstance(value, str): elif isinstance(value, str):
return self._compile_regex(value) return self._compile_regex(value)
else: else:
# FIXME:conf is it okay if we ignore flags here?
return value return value
def to_str(self, value): def to_str(self, value):
@ -1237,12 +1240,10 @@ class Padding(Dict):
_show_valtype = False _show_valtype = False
def __init__(self, none_ok=False, valid_values=None): def __init__(self, none_ok=False):
super().__init__(keytype=String(), valtype=Int(minval=0), super().__init__(keytype=String(), valtype=Int(minval=0),
fixed_keys=['top', 'bottom', 'left', 'right'], fixed_keys=['top', 'bottom', 'left', 'right'],
none_ok=none_ok) none_ok=none_ok)
# FIXME:conf
assert valid_values is None, valid_values
def to_py(self, value): def to_py(self, value):
d = super().to_py(value) d = super().to_py(value)

4
tests/unit/config/test_configtypes.py
View File

@ -856,9 +856,7 @@ class TestFloat:
if math.isnan(converted): if math.isnan(converted):
assert math.isnan(converted_2) assert math.isnan(converted_2)
else: else:
# FIXME:conf this fails with big values... assert converted == pytest.approx(converted_2)
# assert converted == converted_2
pass
@hypothesis.given(val=strategies.one_of(strategies.floats(), @hypothesis.given(val=strategies.one_of(strategies.floats(),
strategies.integers())) strategies.integers()))