Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-14 17:59:29 +02:00
Code Issues Projects Releases Wiki Activity

We actually want the state that the spec call gives us. Also, let's check

Browse Source 
whether our default is callable and return the value of calling it, if so.
This commit is contained in:
James Vega 2004-10-13 14:37:52 +00:00
parent 67d8cf082a
commit aeed361d4c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands.py
View File

@ -515,6 +515,12 @@ def contextify(spec):
spec = context(spec) spec = context(spec)
return spec return spec
def setDefault(state, default):
if callable(default):
state.args.append(default())
else:
state.args.append(default)
class context(object): class context(object):
def __init__(self, spec): def __init__(self, spec):
self.args = () self.args = ()
@ -549,7 +555,7 @@ class additional(context):
self.__parent.__call__(irc, msg, args, state) self.__parent.__call__(irc, msg, args, state)
except IndexError: except IndexError:
log.debug('Got IndexError, returning default.') log.debug('Got IndexError, returning default.')
state.args.append(self.default) setDefault(state, self.default)
class optional(additional): class optional(additional):
def __call__(self, irc, msg, args, state): def __call__(self, irc, msg, args, state):
@ -557,7 +563,7 @@ class optional(additional):
super(optional, self).__call__(irc, msg, args, state) super(optional, self).__call__(irc, msg, args, state)
except (callbacks.ArgumentError, callbacks.Error), e: except (callbacks.ArgumentError, callbacks.Error), e:
log.debug('Got %s, returning default.', utils.exnToString(e)) log.debug('Got %s, returning default.', utils.exnToString(e))
state.args.append(self.default) setDefault(state, self.default)
class any(context): class any(context):
def __call__(self, irc, msg, args, state): def __call__(self, irc, msg, args, state):
@ -612,7 +618,7 @@ class getopts(context):
state.args.append(getopts) state.args.append(getopts)
args[:] = rest args[:] = rest
log.debug('args after %r: %r', self, args) log.debug('args after %r: %r', self, args)
### ###
@ -640,7 +646,7 @@ class Spec(object):
st = State() st = State()
st.__dict__.update(attrs) st.__dict__.update(attrs)
return st return st
def __init__(self, types, allowExtra=False, combineRest=True): def __init__(self, types, allowExtra=False, combineRest=True):
self.types = types self.types = types
self.allowExtra = allowExtra self.allowExtra = allowExtra
@ -667,10 +673,10 @@ class Spec(object):
# This is used below, but we need to rename it so its name isn't # This is used below, but we need to rename it so its name isn't
# shadowed by our locals. # shadowed by our locals.
_decorators = decorators _decorators = decorators
def wrap(f, specList, decorators=None, **kw): def wrap(f, specList=[], decorators=None, **kw):
spec = Spec(specList, **kw) spec = Spec(specList, **kw)
def newf(self, irc, msg, args, **kwargs): def newf(self, irc, msg, args, **kwargs):
spec(irc, msg, args, stateAttrs={'cb': self, 'log': self.log}) state = spec(irc, msg, args, stateAttrs={'cb': self, 'log': self.log})
f(self, irc, msg, args, *state.args, **state.kwargs) f(self, irc, msg, args, *state.args, **state.kwargs)
newf = utils.changeFunctionName(newf, f.func_name, f.__doc__) newf = utils.changeFunctionName(newf, f.func_name, f.__doc__)
if decorators is not None: if decorators is not None: