Python 3 Start

This commit is contained in:
Luke Rogers 2014-03-06 11:45:00 +13:00
parent 9f029c8ceb
commit 141fe8d80c
67 changed files with 264 additions and 274 deletions

View file

@ -8,7 +8,7 @@ def _hook_add(func, add, name=''):
func._hook.append(add)
if not hasattr(func, '_filename'):
func._filename = func.func_code.co_filename
func._filename = func.__code__.co_filename
if not hasattr(func, '_args'):
argspec = inspect.getargspec(func)
@ -39,7 +39,7 @@ def _hook_add(func, add, name=''):
def sieve(func):
if func.func_code.co_argcount != 5:
if func.__code__.co_argcount != 5:
raise ValueError(
'sieves must take 5 arguments: (bot, input, func, type, args)')
_hook_add(func, ['sieve', (func,)])
@ -50,7 +50,7 @@ def command(arg=None, **kwargs):
args = {}
def command_wrapper(func):
args.setdefault('name', func.func_name)
args.setdefault('name', func.__name__)
_hook_add(func, ['command', (func, args)], 'command')
return func
@ -67,7 +67,7 @@ def event(arg=None, **kwargs):
args = kwargs
def event_wrapper(func):
args['name'] = func.func_name
args['name'] = func.__name__
args.setdefault('events', ['*'])
_hook_add(func, ['event', (func, args)], 'event')
return func
@ -89,7 +89,7 @@ def regex(regex, flags=0, **kwargs):
args = kwargs
def regex_wrapper(func):
args['name'] = func.func_name
args['name'] = func.__name__
args['regex'] = regex
args['re'] = re.compile(regex, flags)
_hook_add(func, ['regex', (func, args)], 'regex')