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

Be a bit more relaxed about values for Perc

Browse Source 
We now allow float/int for objects, and strings without a trailing % sign.
This commit is contained in:
Florian Bruhin 2017-06-26 21:47:38 +02:00
parent cbf6e4287f
commit 127db2fe42
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/config/configtypes.py
View File

@ -632,21 +632,22 @@ class Float(_Numeric):
class Perc(_Numeric): class Perc(_Numeric):
"""A percentage, as a string ending with %.""" """A percentage."""
def to_py(self, value): def to_py(self, value):
self._basic_py_validation(value, str) self._basic_py_validation(value, (float, int, str))
if not value: if not value:
return None return None
if not value.endswith('%'): if isinstance(value, str):
raise configexc.ValidationError(value, "does not end with %") value = value.rstrip('%')
try: try:
floatval = float(value[:-1]) value = float(value)
except ValueError: except ValueError:
raise configexc.ValidationError(value, "must be a percentage!") raise configexc.ValidationError(
self._validate_bounds(floatval, suffix='%') value, "must be a valid number!")
return floatval self._validate_bounds(value, suffix='%')
return value
def to_str(self, value): def to_str(self, value):
if value is None: if value is None:

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

@ -884,19 +884,20 @@ class TestPerc:
@pytest.mark.parametrize('kwargs, val', [ @pytest.mark.parametrize('kwargs, val', [
({}, '1337%'), ({}, '1337%'),
({}, '1337'),
({}, '1337.42%'), ({}, '1337.42%'),
({}, '1337.42'),
({'maxval': 2}, '2%'), ({'maxval': 2}, '2%'),
]) ])
def test_from_str_valid(self, klass, kwargs, val): def test_from_str_valid(self, klass, kwargs, val):
assert klass(**kwargs).from_str(val) == val assert klass(**kwargs).from_str(val) == val
@pytest.mark.parametrize('kwargs, val', [ @pytest.mark.parametrize('kwargs, val', [
({}, '1337'),
({}, '1337%%'),
({}, 'foobar'), ({}, 'foobar'),
({}, 'foobar%'), ({}, 'foobar%'),
({'minval': 2}, '1%'), ({'minval': 2}, '1%'),
({'maxval': 2}, '3%'), ({'maxval': 2}, '3%'),
({'maxval': 2}, '3'),
({'minval': 2, 'maxval': 3}, '1%'), ({'minval': 2, 'maxval': 3}, '1%'),
({'minval': 2, 'maxval': 3}, '4%'), ({'minval': 2, 'maxval': 3}, '4%'),
]) ])
@ -906,6 +907,9 @@ class TestPerc:
@pytest.mark.parametrize('kwargs, val, expected', [ @pytest.mark.parametrize('kwargs, val, expected', [
({}, '1337.42%', 1337.42), ({}, '1337.42%', 1337.42),
({}, '1337.42', 1337.42),
({}, 23, 23),
({}, 23.42, 23.42),
({'minval': 2}, '2.01%', 2.01), ({'minval': 2}, '2.01%', 2.01),
]) ])
def test_to_py_valid(self, klass, kwargs, val, expected): def test_to_py_valid(self, klass, kwargs, val, expected):
@ -913,8 +917,8 @@ class TestPerc:
@pytest.mark.parametrize('kwargs, val', [ @pytest.mark.parametrize('kwargs, val', [
({}, 'foobar'), ({}, 'foobar'),
({}, 23),
({'minval': 2, 'maxval': 3}, '1.99%'), ({'minval': 2, 'maxval': 3}, '1.99%'),
({'minval': 2, 'maxval': 3}, '1.99'),
]) ])
def test_to_py_invalid(self, klass, kwargs, val): def test_to_py_invalid(self, klass, kwargs, val):
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):