mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-23 11:09:23 +01:00
Slightly nicer fix, I don't know why I didn't think of this before.
This commit is contained in:
parent
7834a2c50b
commit
74e3cce0a2
@ -407,25 +407,19 @@ class Regexp(Value):
|
|||||||
def set(self, s):
|
def set(self, s):
|
||||||
try:
|
try:
|
||||||
if s:
|
if s:
|
||||||
self.value = utils.perlReToPythonRe(s)
|
self.setValue(utils.perlReToPythonRe(s), sr=s)
|
||||||
self._lastModified = time.time()
|
|
||||||
# Since we aren't calling self.setValue(), we need to run the
|
|
||||||
# following code. If we don't, self.value isn't properly
|
|
||||||
# updated.
|
|
||||||
if self.supplyDefault:
|
|
||||||
for (name, v) in self.children.items():
|
|
||||||
if v.__class__ is self.X:
|
|
||||||
self.unregister(name)
|
|
||||||
else:
|
else:
|
||||||
self.setValue(None)
|
self.setValue(None)
|
||||||
self.sr = s
|
|
||||||
except ValueError, e:
|
except ValueError, e:
|
||||||
self.error(e)
|
self.error(e)
|
||||||
|
|
||||||
def setValue(self, v):
|
def setValue(self, v, sr=None):
|
||||||
if v is None:
|
if v is None:
|
||||||
self.sr = ''
|
self.sr = ''
|
||||||
Value.setValue(self, None)
|
Value.setValue(self, None)
|
||||||
|
elif sr is not None:
|
||||||
|
self.sr = sr
|
||||||
|
Value.setValue(self, v)
|
||||||
else:
|
else:
|
||||||
raise InvalidRegistryValue, \
|
raise InvalidRegistryValue, \
|
||||||
'Can\'t setValue a regexp, there would be an inconsistency '\
|
'Can\'t setValue a regexp, there would be an inconsistency '\
|
||||||
|
Loading…
Reference in New Issue
Block a user