GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-27 04:34:13 +01:00
Code Issues Projects Releases Wiki Activity

Logging format tweaks

Browse Source
This commit is contained in:
James Lu 2015-07-05 16:46:57 -07:00
parent 211decd2aa
commit 87781abc82
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils.py
View File

@ -100,10 +100,10 @@ def parseModes(irc, target, args):
return ValueError('No modes supplied in parseModes query: %r' % modes) return ValueError('No modes supplied in parseModes query: %r' % modes)
args = args[1:] args = args[1:]
if usermodes: if usermodes:
log.debug('Using irc.umodes for this query: %s', irc.umodes) log.debug('(%s) Using irc.umodes for this query: %s', irc.name, irc.umodes)
supported_modes = irc.umodes supported_modes = irc.umodes
else: else:
log.debug('Using irc.cmodes for this query: %s', irc.cmodes) log.debug('(%s) Using irc.cmodes for this query: %s', irc.name, irc.cmodes)
supported_modes = irc.cmodes supported_modes = irc.cmodes
res = [] res = []
for mode in modestring: for mode in modestring:
@ -113,22 +113,22 @@ def parseModes(irc, target, args):
arg = None arg = None
if mode in (supported_modes['*A'] + supported_modes['*B']): if mode in (supported_modes['*A'] + supported_modes['*B']):
# Must have parameter. # Must have parameter.
log.debug('%s: This mode must have parameter.', mode) log.debug('Mode %s: This mode must have parameter.', mode)
arg = args.pop(0) arg = args.pop(0)
elif mode in irc.prefixmodes and not usermodes: elif mode in irc.prefixmodes and not usermodes:
# We're setting a prefix mode on someone (e.g. +o user1) # We're setting a prefix mode on someone (e.g. +o user1)
log.debug('%s: This mode is a prefix mode.', mode) log.debug('Mode %s: This mode is a prefix mode.', mode)
arg = args.pop(0) arg = args.pop(0)
elif prefix == '+' and mode in supported_modes['*C']: elif prefix == '+' and mode in supported_modes['*C']:
# Only has parameter when setting. # Only has parameter when setting.
log.debug('%s: Only has parameter when setting.', mode) log.debug('Mode %s: Only has parameter when setting.', mode)
arg = args.pop(0) arg = args.pop(0)
res.append((prefix + mode, arg)) res.append((prefix + mode, arg))
return res return res
def applyModes(irc, target, changedmodes): def applyModes(irc, target, changedmodes):
usermodes = not isChannel(target) usermodes = not isChannel(target)
log.debug('usermodes? %s' % usermodes) log.debug('(%s) Using usermodes for this query? %s', irc.name, usermodes)
if usermodes: if usermodes:
modelist = irc.users[target].modes modelist = irc.users[target].modes
else: else:
@ -160,7 +160,7 @@ def applyModes(irc, target, changedmodes):
mode[0] = mode[0].replace('-', '+') mode[0] = mode[0].replace('-', '+')
modelist.discard(mode) modelist.discard(mode)
log.debug('(%s) Removing mode %r on %s', irc.name, mode, target) log.debug('(%s) Removing mode %r on %s', irc.name, mode, target)
log.debug('Final modelist: %s' % modelist) log.debug('(%s) Final modelist: %s', irc.name, modelist)
def joinModes(modes): def joinModes(modes):
modelist = '' modelist = ''