Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

registry: Fix regression preventing default None value for Regexp.

This commit is contained in:
Valentin Lorentz 2020-09-05 22:02:53 +02:00
parent 6a3be33fcd
commit 23417b0675
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/registry.py
View File

@ -768,17 +768,23 @@ class Regexp(Value):
# value of there parent change. # value of there parent change.
v = (s, utils.str.perlReToPythonRe(s)) v = (s, utils.str.perlReToPythonRe(s))
else: else:
v = ('', '') v = None
except ValueError as e: except ValueError as e:
self.error(e) self.error(e)
else: else:
super().set(v) super().set(v)
def __call__(self): def __call__(self):
return self.value[1] if self.value is None:
return None
else:
return self.value[1]
def __str__(self): def __str__(self):
return self.value[0] if self.value is None:
return ''
else:
return self.value[0]
class SeparatedListOf(Value): class SeparatedListOf(Value):
__slots__ = () __slots__ = ()

2
test/test_registry.py
View File

@ -182,8 +182,6 @@ class ValuesTestCase(SupyTestCase):
self.assertTrue(v().match('foo')) self.assertTrue(v().match('foo'))
v.set('') v.set('')
self.assertEqual(v(), None) self.assertEqual(v(), None)
self.assertRaises(registry.InvalidRegistryValue,
v.setValue, re.compile(r'foo'))
def testBackslashesKeys(self): def testBackslashesKeys(self):
conf.supybot.reply.whenAddressedBy.strings.get(':foo').set('=/*') conf.supybot.reply.whenAddressedBy.strings.get(':foo').set('=/*')