diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/base/test_events.py | 6 | ||||
| -rw-r--r-- | test/engine/test_pool.py | 2 | ||||
| -rw-r--r-- | test/ext/test_mutable.py | 8 | ||||
| -rw-r--r-- | test/orm/test_mapper.py | 4 | ||||
| -rw-r--r-- | test/orm/test_session.py | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/test/base/test_events.py b/test/base/test_events.py index 5fce23724..664decbf1 100644 --- a/test/base/test_events.py +++ b/test/base/test_events.py @@ -148,7 +148,7 @@ class TestCustomTargets(TestBase): class TargetEvents(event.Events): @classmethod - def accept_with(cls, target): + def _accept_with(cls, target): if target == 'one': return Target else: @@ -188,14 +188,14 @@ class TestListenOverride(TestBase): class TargetEvents(event.Events): @classmethod - def listen(cls, target, identifier, fn, add=False): + def _listen(cls, target, identifier, fn, add=False): if add: def adapt(x, y): fn(x + y) else: adapt = fn - event.Events.listen(target, identifier, adapt) + event.Events._listen(target, identifier, adapt) def on_event_one(self, x, y): pass diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 91f675b84..392223d79 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -404,7 +404,7 @@ class PoolEventsTest(PoolTestBase): def teardown(self): # TODO: need to get remove() functionality # going - pool.Pool.dispatch.clear() + pool.Pool.dispatch._clear() class DeprecatedPoolListenerTest(PoolTestBase): @testing.uses_deprecated(r".*Use event.listen") diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py index e9573f50d..8a51bd3fa 100644 --- a/test/ext/test_mutable.py +++ b/test/ext/test_mutable.py @@ -51,8 +51,8 @@ class _MutableDictTestBase(object): def teardown(self): # clear out mapper events - Mapper.dispatch.clear() - ClassManager.dispatch.clear() + Mapper.dispatch._clear() + ClassManager.dispatch._clear() super(_MutableDictTestBase, self).teardown() @testing.resolve_artifact_names @@ -180,8 +180,8 @@ class MutableCompositesTest(_base.MappedTest): def teardown(self): # clear out mapper events - Mapper.dispatch.clear() - ClassManager.dispatch.clear() + Mapper.dispatch._clear() + ClassManager.dispatch._clear() super(MutableCompositesTest, self).teardown() @classmethod diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py index ba7a82c62..11a66c17f 100644 --- a/test/orm/test_mapper.py +++ b/test/orm/test_mapper.py @@ -2304,8 +2304,8 @@ class MapperEventsTest(_fixtures.FixtureTest): def teardown(self): # TODO: need to get remove() functionality # going - Mapper.dispatch.clear() - ClassManager.dispatch.clear() + Mapper.dispatch._clear() + ClassManager.dispatch._clear() super(MapperEventsTest, self).teardown() def listen_all(self, mapper, **kw): diff --git a/test/orm/test_session.py b/test/orm/test_session.py index ed7a8dda6..8596e585a 100644 --- a/test/orm/test_session.py +++ b/test/orm/test_session.py @@ -1482,7 +1482,7 @@ class SessionEventsTest(_fixtures.FixtureTest): def teardown(self): # TODO: need to get remove() functionality # going - Session.dispatch.clear() + Session.dispatch._clear() super(SessionEventsTest, self).teardown() |