Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

dont expose has_magic/get_magic in utils/__init__.py, ref directly

Browse source
This commit is contained in:
jesopo 2019-11-15 13:41:03 +00:00
parent bfcf40edd7
commit 5e8cf06a45
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ModuleManager.py
View file

@ -239,15 +239,16 @@ class ModuleManager(object):
# @utils.hook() magic # @utils.hook() magic
for attribute_name in dir(module_object): for attribute_name in dir(module_object):
attribute = getattr(module_object, attribute_name) attribute = getattr(module_object, attribute_name)
if inspect.ismethod(attribute) and utils.has_magic(attribute): if (inspect.ismethod(attribute) and
magic = utils.get_magic(attribute) utils.decorators.has_magic(attribute)):
magic = utils.decorators.get_magic(attribute)
for hook, kwargs in magic.get_hooks(): for hook, kwargs in magic.get_hooks():
context_events.on(hook)._hook(attribute, kwargs=kwargs) context_events.on(hook)._hook(attribute, kwargs=kwargs)
# @utils.export() magic # @utils.export() magic
if utils.has_magic(module_object): if utils.decorators.has_magic(module_object):
magic = utils.get_magic(module_object) magic = utils.decorators.get_magic(module_object)
for key, value in magic.get_exports(): for key, value in magic.get_exports():
context_exports.add(key, value) context_exports.add(key, value)

4
src/utils/__init__.py
View file

@ -1,8 +1,8 @@
import contextlib, datetime, decimal, enum, io, ipaddress, multiprocessing import contextlib, datetime, decimal, enum, io, ipaddress, multiprocessing
import queue, re, signal, threading, typing import queue, re, signal, threading, typing
from . import cli, consts, irc, http, parse, security from . import cli, consts, decorators, irc, http, parse, security
from .decorators import export, get_magic, has_magic, hook, kwarg from .decorators import export, hook, kwarg
from .settings import (BoolSetting, FunctionSetting, IntRangeSetting, from .settings import (BoolSetting, FunctionSetting, IntRangeSetting,
IntSetting, OptionsSetting, sensitive_format, SensitiveSetting, Setting) IntSetting, OptionsSetting, sensitive_format, SensitiveSetting, Setting)