3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-28 05:29:25 +01:00

Merge branch 'devel' into wip/services

This commit is contained in:
James Lu 2016-05-14 11:58:49 -07:00
commit 123e72d162

View File

@ -632,7 +632,7 @@ class Irc():
'it\'s a prefix mode.', self.name, str(mode)) 'it\'s a prefix mode.', self.name, str(mode))
continue continue
if mode[0][0] == '+': if mode[0][0] != '-':
# We're adding a mode # We're adding a mode
existing = [m for m in modelist if m[0] == real_mode[0] and m[1] != real_mode[1]] existing = [m for m in modelist if m[0] == real_mode[0] and m[1] != real_mode[1]]
if existing and real_mode[1] and real_mode[0] not in self.cmodes['*A']: if existing and real_mode[1] and real_mode[0] not in self.cmodes['*A']:
@ -656,7 +656,6 @@ class Irc():
if oldmode[0] == real_mode[0]: if oldmode[0] == real_mode[0]:
modelist.discard(oldmode) modelist.discard(oldmode)
else: else:
# Swap the - for a + and then remove it from the list.
modelist.discard(real_mode) modelist.discard(real_mode)
log.debug('(%s) Final modelist: %s', self.name, modelist) log.debug('(%s) Final modelist: %s', self.name, modelist)
if usermodes: if usermodes: