From c974ee9b449b596043e1804087618b2e9e45c5d0 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 22 Oct 2017 01:19:38 -0700 Subject: [PATCH] hybrid: various cleanup --- protocols/hybrid.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/protocols/hybrid.py b/protocols/hybrid.py index 16e9cc6..88e56ff 100644 --- a/protocols/hybrid.py +++ b/protocols/hybrid.py @@ -15,9 +15,7 @@ class HybridProtocol(TS6Protocol): super().__init__(*args, **kwargs) self.casemapping = 'ascii' - self.caps = {} self.hook_map = {'EOB': 'ENDBURST', 'TBURST': 'TOPIC', 'SJOIN': 'JOIN'} - self.protocol_caps -= {'slash-in-hosts'} def post_connect(self): """Initializes a connection to a server.""" @@ -175,14 +173,11 @@ class HybridProtocol(TS6Protocol): # We only get a list of keywords here. Hybrid obviously assumes that # we know what modes it supports (indeed, this is a standard list). # <- CAPAB :UNDLN UNKLN KLN TBURST KNOCK ENCAP DLN IE EX HOPS CHW SVS CLUSTER EOB QS - self.caps = caps = args[0].split() + self._caps = caps = args[0].split() for required_cap in ('SVS', 'EOB', 'HOPS', 'QS', 'TBURST'): if required_cap not in caps: raise ProtocolError('%s not found in TS6 capabilities list; this is required! (got %r)' % (required_cap, caps)) - log.debug('(%s) self.connected set!', self.name) - self.connected.set() - def handle_uid(self, numeric, command, args): """ Handles Hybrid-style UID commands (user introduction). This is INCOMPATIBLE @@ -278,7 +273,7 @@ class HybridProtocol(TS6Protocol): # Propagate the hostmask change as a hook. self.call_hooks([numeric, 'CHGHOST', - {'target': target, 'newhost': host}]) + {'target': target, 'newhost': host}]) parsedmodes.remove(modepair)