GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-28 11:30:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into wip/unrealircd

Browse Source
This commit is contained in:
James Lu 2015-10-09 21:36:02 -07:00
commit f97d3eb756
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes.py
View File

@ -248,6 +248,7 @@ class Irc():
except Exception: except Exception:
log.exception('(%s) Caught error in handle_events, disconnecting!', self.name) log.exception('(%s) Caught error in handle_events, disconnecting!', self.name)
log.error('(%s) The offending line was: <- %s', self.name, line) log.error('(%s) The offending line was: <- %s', self.name, line)
self.aborted.set()
return return
# Only call our hooks if there's data to process. Handlers that support # Only call our hooks if there's data to process. Handlers that support
# hooks will return a dict of parsed arguments, which can be passed on # hooks will return a dict of parsed arguments, which can be passed on

2
protocols/inspircd.py
View File

@ -374,7 +374,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
self.irc.maxnicklen = int(caps['NICKMAX']) self.irc.maxnicklen = int(caps['NICKMAX'])
self.irc.maxchanlen = int(caps['CHANMAX']) self.irc.maxchanlen = int(caps['CHANMAX'])
# Modes are divided into A, B, C, and D classes # Modes are divided into A, B, C, and D classes
# See http://www.self.irc.org/tech_docs/005.html # See http://www.irc.org/tech_docs/005.html
# FIXME: Find a better way to assign/store this. # FIXME: Find a better way to assign/store this.
self.irc.cmodes['*A'], self.irc.cmodes['*B'], self.irc.cmodes['*C'], self.irc.cmodes['*D'] \ self.irc.cmodes['*A'], self.irc.cmodes['*B'], self.irc.cmodes['*C'], self.irc.cmodes['*D'] \