From 2861b5a33404ea67cf67d0b9e443d88e2ae286c2 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sun, 15 May 2005 16:50:10 +0000 Subject: [PATCH] Fixed some uselessness in log.MetaFirewall and removed an attribute that shouldn't be firewalled (it was vestigial). --- src/irclib.py | 4 +++- src/log.py | 14 +++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/irclib.py b/src/irclib.py index 3cdaf9713..a27511737 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -75,7 +75,9 @@ class IrcCallback(IrcCommandDispatcher): '__lt__': lambda self: 0, 'inFilter': lambda self, irc, msg: msg, 'outFilter': lambda self, irc, msg: msg, - 'name': lambda self: self.__class__.__name__,} + 'name': lambda self: self.__class__.__name__, + 'callPrecedence': lambda self, irc: ([], []), + } def __init__(self, *args, **kwargs): super(IrcCallback, self).__init__(*args, **kwargs) diff --git a/src/log.py b/src/log.py index 6d1823b0b..7b9f8d617 100644 --- a/src/log.py +++ b/src/log.py @@ -331,18 +331,14 @@ def firewall(f, errorHandler=None): class MetaFirewall(type): def __new__(cls, name, bases, dict): firewalled = {} - for base in bases: - if hasattr(base, '__firewalled__'): - firewalled.update(base.__firewalled__) if '__firewalled__' in dict: firewalled.update(dict['__firewalled__']) for attr in firewalled: - if attr in dict: - try: - errorHandler = firewalled[attr] - except: - errorHandler = None - dict[attr] = firewall(dict[attr], errorHandler) + try: + errorHandler = firewalled[attr] + except: + errorHandler = None + dict[attr] = firewall(dict[attr], errorHandler) return super(MetaFirewall, cls).__new__(cls, name, bases, dict) #return type.__new__(cls, name, bases, dict)