diff --git a/bloop/engine.py b/bloop/engine.py index 4374af4e..ef3412fe 100644 --- a/bloop/engine.py +++ b/bloop/engine.py @@ -1,4 +1,3 @@ -import blinker import declare from .client import Client @@ -8,7 +7,7 @@ from .index import Index from .model import ModelMetaclass from .tracking import clear, is_model_verified, sync, verify_model -from .util import walk_subclasses +from .util import walk_subclasses, signal __all__ = ["Engine", "before_bind_model", "before_create_table"] @@ -21,8 +20,8 @@ } # Signals! -before_bind_model = blinker.signal("before_bind_model") -before_create_table = blinker.signal("before_create_table") +before_bind_model = signal("before_bind_model") +before_create_table = signal("before_create_table") def value_of(column): diff --git a/bloop/util.py b/bloop/util.py index 6bc3779b..d7bdd3d3 100644 --- a/bloop/util.py +++ b/bloop/util.py @@ -1,7 +1,12 @@ +import blinker import weakref +__all__ = ["WeakDefaultDictionary", "ordered", "signal", "walk_subclasses"] -__all__ = ["ordered", "walk_subclasses", "WeakDefaultDictionary"] +# Isolate to avoid collisions with other modules +# Don't expose the namespace. +__signals = blinker.Namespace() +signal = __signals.signal def ordered(obj): diff --git a/tox.ini b/tox.ini index 22666304..7d9bed82 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] basepython=python35 -envlist = unit, docs +envlist = unit, integ, docs [testenv:unit] deps = pytest @@ -13,7 +13,6 @@ commands = [testenv:integ] passenv = AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY -ignore_errors = True deps = pytest coverage commands = py.test tests/integ []