Made the asserts more verbose.

This commit is contained in:
Jeremy Fincher 2004-10-29 00:45:56 +00:00
parent ecc61d3cbd
commit afff2734f4

View File

@ -53,7 +53,7 @@ def isCapability(capability):
def fromChannelCapability(capability): def fromChannelCapability(capability):
"""Returns a (channel, capability) tuple from a channel capability.""" """Returns a (channel, capability) tuple from a channel capability."""
assert isChannelCapability(capability) assert isChannelCapability(capability), 'got %s' % capability
return capability.split(',', 1) return capability.split(',', 1)
def isChannelCapability(capability): def isChannelCapability(capability):
@ -66,8 +66,8 @@ def isChannelCapability(capability):
def makeChannelCapability(channel, capability): def makeChannelCapability(channel, capability):
"""Makes a channel capability given a channel and a capability.""" """Makes a channel capability given a channel and a capability."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
assert ircutils.isChannel(channel) assert ircutils.isChannel(channel), 'got %s' % capability
return '%s,%s' % (channel, capability) return '%s,%s' % (channel, capability)
def isAntiCapability(capability): def isAntiCapability(capability):
@ -78,10 +78,10 @@ def isAntiCapability(capability):
def makeAntiCapability(capability): def makeAntiCapability(capability):
"""Returns the anticapability of a given capability.""" """Returns the anticapability of a given capability."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
assert not isAntiCapability(capability), \ assert not isAntiCapability(capability), \
'makeAntiCapability does not work on anticapabilities. ' \ 'makeAntiCapability does not work on anticapabilities. ' \
'You probably want invertCapability.' 'You probably want invertCapability; got %s.' % capability
if isChannelCapability(capability): if isChannelCapability(capability):
(channel, capability) = fromChannelCapability(capability) (channel, capability) = fromChannelCapability(capability)
return makeChannelCapability(channel, '-' + capability) return makeChannelCapability(channel, '-' + capability)
@ -90,7 +90,7 @@ def makeAntiCapability(capability):
def unAntiCapability(capability): def unAntiCapability(capability):
"""Takes an anticapability and returns the non-anti form.""" """Takes an anticapability and returns the non-anti form."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
if not isAntiCapability(capability): if not isAntiCapability(capability):
raise ValueError, '%s is not an anti capability' % capability raise ValueError, '%s is not an anti capability' % capability
if isChannelCapability(capability): if isChannelCapability(capability):
@ -101,14 +101,14 @@ def unAntiCapability(capability):
def invertCapability(capability): def invertCapability(capability):
"""Make a capability into an anticapability and vice versa.""" """Make a capability into an anticapability and vice versa."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
if isAntiCapability(capability): if isAntiCapability(capability):
return unAntiCapability(capability) return unAntiCapability(capability)
else: else:
return makeAntiCapability(capability) return makeAntiCapability(capability)
def canonicalCapability(capability): def canonicalCapability(capability):
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
if callable(capability): if callable(capability):
capability = capability() capability = capability()
return capability.lower() return capability.lower()
@ -292,7 +292,7 @@ class IrcUser(object):
def addHostmask(self, hostmask): def addHostmask(self, hostmask):
"""Adds a hostmask to the user's hostmasks.""" """Adds a hostmask to the user's hostmasks."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
if len(unWildcardHostmask(hostmask)) < 8: if len(unWildcardHostmask(hostmask)) < 8:
raise ValueError, \ raise ValueError, \
'Hostmask must contain at least 8 non-wildcard characters.' 'Hostmask must contain at least 8 non-wildcard characters.'
@ -359,17 +359,17 @@ class IrcChannel(object):
def addBan(self, hostmask, expiration=0): def addBan(self, hostmask, expiration=0):
"""Adds a ban to the channel banlist.""" """Adds a ban to the channel banlist."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
self.bans[hostmask] = int(expiration) self.bans[hostmask] = int(expiration)
def removeBan(self, hostmask): def removeBan(self, hostmask):
"""Removes a ban from the channel banlist.""" """Removes a ban from the channel banlist."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
return self.bans.pop(hostmask) return self.bans.pop(hostmask)
def checkBan(self, hostmask): def checkBan(self, hostmask):
"""Checks whether a given hostmask is banned by the channel banlist.""" """Checks whether a given hostmask is banned by the channel banlist."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
now = time.time() now = time.time()
for (pattern, expiration) in self.bans.items(): for (pattern, expiration) in self.bans.items():
if now < expiration or not expiration: if now < expiration or not expiration:
@ -382,22 +382,22 @@ class IrcChannel(object):
def addIgnore(self, hostmask, expiration=0): def addIgnore(self, hostmask, expiration=0):
"""Adds an ignore to the channel ignore list.""" """Adds an ignore to the channel ignore list."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
self.ignores[hostmask] = int(expiration) self.ignores[hostmask] = int(expiration)
def removeIgnore(self, hostmask): def removeIgnore(self, hostmask):
"""Removes an ignore from the channel ignore list.""" """Removes an ignore from the channel ignore list."""
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
return self.ignores.pop(hostmask) return self.ignores.pop(hostmask)
def addCapability(self, capability): def addCapability(self, capability):
"""Adds a capability to the channel's default capabilities.""" """Adds a capability to the channel's default capabilities."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % hostmask
self.capabilities.add(capability) self.capabilities.add(capability)
def removeCapability(self, capability): def removeCapability(self, capability):
"""Removes a capability from the channel's default capabilities.""" """Removes a capability from the channel's default capabilities."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % hostmask
self.capabilities.remove(capability) self.capabilities.remove(capability)
def setDefaultCapability(self, b): def setDefaultCapability(self, b):
@ -406,7 +406,7 @@ class IrcChannel(object):
def checkCapability(self, capability): def checkCapability(self, capability):
"""Checks whether a certain capability is allowed by the channel.""" """Checks whether a certain capability is allowed by the channel."""
assert isCapability(capability) assert isCapability(capability), 'got %s' % capability
if capability in self.capabilities: if capability in self.capabilities:
return self.capabilities.check(capability) return self.capabilities.check(capability)
else: else:
@ -421,7 +421,7 @@ class IrcChannel(object):
return True return True
if world.testing: if world.testing:
return False return False
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
if self.checkBan(hostmask): if self.checkBan(hostmask):
return True return True
now = time.time() now = time.time()
@ -903,7 +903,7 @@ class IgnoresDB(object):
return False return False
def add(self, hostmask, expiration=0): def add(self, hostmask, expiration=0):
assert ircutils.isUserHostmask(hostmask) assert ircutils.isUserHostmask(hostmask), 'got %s' % hostmask
self.hostmasks[hostmask] = expiration self.hostmasks[hostmask] = expiration
def remove(self, hostmask): def remove(self, hostmask):