Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-19 08:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Config: Prevent variable creation when trying to get the value of a channel-specific variable for a non-channel.

Browse Source
This commit is contained in:
Valentin Lorentz 2014-05-31 20:44:56 +02:00
parent fd2ecf0dec
commit b14ed2c5d9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Config/plugin.py
View File

@ -54,12 +54,12 @@ def getWrapper(name):
raise registry.InvalidRegistryName(name) raise registry.InvalidRegistryName(name)
group = getattr(conf, parts.pop(0)) group = getattr(conf, parts.pop(0))
while parts: while parts:
try: part = parts.pop(0)
group = group.get(parts.pop(0)) if group.__hasattr__(part):
# We'll catch registry.InvalidRegistryName and re-raise it here so group = group.get(part)
else:
# We'll raise registry.InvalidRegistryName here so
# that we have a useful error message for the user. # that we have a useful error message for the user.
except (registry.NonExistentRegistryEntry,
registry.InvalidRegistryName):
raise registry.InvalidRegistryName(name) raise registry.InvalidRegistryName(name)
return group return group

3
src/registry.py
View File

@ -214,6 +214,9 @@ class Group(object):
self.register(attr, v) self.register(attr, v)
return v return v
def __hasattr__(self, attr):
return attr in self._children
def __getattr__(self, attr): def __getattr__(self, attr):
if attr in self._children: if attr in self._children:
return self._children[attr] return self._children[attr]