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

Fixed the reloading sets.Set bug more cleanly.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-11-03 23:23:28 +00:00
parent c362784a2e
commit 944ef33dce
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ircdb.py
View File

@ -104,7 +104,8 @@ _invert = invertCapability
class CapabilitySet(sets.Set): class CapabilitySet(sets.Set):
"""A subclass of set handling basic capability stuff.""" """A subclass of set handling basic capability stuff."""
def __init__(self, capabilities=()): def __init__(self, capabilities=()):
super(CapabilitySet, self).__init__() self.__parent = super(CapabilitySet, self)
self.__parent.__init__()
for capability in capabilities: for capability in capabilities:
self.add(capability) self.add(capability)
@ -112,20 +113,20 @@ class CapabilitySet(sets.Set):
"""Adds a capability to the set.""" """Adds a capability to the set."""
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
inverted = _invert(capability) inverted = _invert(capability)
if super(CapabilitySet, self).__contains__(inverted): if self.__parent.__contains__(inverted):
super(CapabilitySet, self).remove(inverted) self.__parent.remove(inverted)
super(CapabilitySet, self).add(capability) self.__parent.add(capability)
def remove(self, capability): def remove(self, capability):
"""Removes a capability from the set.""" """Removes a capability from the set."""
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
super(CapabilitySet, self).remove(capability) self.__parent.remove(capability)
def __contains__(self, capability): def __contains__(self, capability):
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
if super(CapabilitySet, self).__contains__(capability): if self.__parent.__contains__(capability):
return True return True
if super(CapabilitySet, self).__contains__(_invert(capability)): if self.__parent.__contains__(_invert(capability)):
return True return True
else: else:
return False return False
@ -135,9 +136,9 @@ class CapabilitySet(sets.Set):
'allowed' given its (or its anticapability's) presence in the set. 'allowed' given its (or its anticapability's) presence in the set.
""" """
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
if super(CapabilitySet, self).__contains__(capability): if self.__parent.__contains__(capability):
return True return True
elif super(CapabilitySet, self).__contains__(_invert(capability)): elif self.__parent.__contains__(_invert(capability)):
return False return False
else: else:
raise KeyError, capability raise KeyError, capability
@ -149,14 +150,18 @@ class CapabilitySet(sets.Set):
antiOwner = makeAntiCapability('owner') antiOwner = makeAntiCapability('owner')
class UserCapabilitySet(CapabilitySet): class UserCapabilitySet(CapabilitySet):
"""A subclass of CapabilitySet to handle the owner capability correctly.""" """A subclass of CapabilitySet to handle the owner capability correctly."""
def __init__(self, *args, **kwargs):
self.__parent = super(UserCapabilitySet, self)
self.__parent.__init__(*args, **kwargs)
def __contains__(self, capability): def __contains__(self, capability):
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
if capability == 'owner' or capability == antiOwner: if capability == 'owner' or capability == antiOwner:
return True return True
elif super(UserCapabilitySet, self).__contains__('owner'): elif self.__parent.__contains__('owner'):
return True return True
else: else:
return super(UserCapabilitySet, self).__contains__(capability) return self.__parent.__contains__(capability)
def check(self, capability): def check(self, capability):
"""Returns the appropriate boolean for whether a given capability is """Returns the appropriate boolean for whether a given capability is
@ -166,23 +171,23 @@ class UserCapabilitySet(CapabilitySet):
""" """
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
if capability == 'owner' or capability == antiOwner: if capability == 'owner' or capability == antiOwner:
if super(UserCapabilitySet, self).__contains__('owner'): if self.__parent.__contains__('owner'):
return not isAntiCapability(capability) return not isAntiCapability(capability)
else: else:
return isAntiCapability(capability) return isAntiCapability(capability)
elif super(UserCapabilitySet, self).__contains__('owner'): elif self.__parent.__contains__('owner'):
if isAntiCapability(capability): if isAntiCapability(capability):
return False return False
else: else:
return True return True
else: else:
return super(UserCapabilitySet, self).check(capability) return self.__parent.check(capability)
def add(self, capability): def add(self, capability):
"""Adds a capability to the set. Just make sure it's not -owner.""" """Adds a capability to the set. Just make sure it's not -owner."""
capability = ircutils.toLower(capability) capability = ircutils.toLower(capability)
assert capability != '-owner', '"-owner" disallowed.' assert capability != '-owner', '"-owner" disallowed.'
super(UserCapabilitySet, self).add(capability) self.__parent.add(capability)
class IrcUser(object): class IrcUser(object):
"""This class holds the capabilities and authentications for a user.""" """This class holds the capabilities and authentications for a user."""