- Fixed regression regarding the declarative ``__declare_first__``

and ``__declare_last__`` accessors where these would no longer be
called on the superclass of the declarative base.
fixes #3383

2 files changed, 13 insertions, 1 deletions

diff --git a/lib/sqlalchemy/testing/__init__.py b/lib/sqlalchemy/testing/__init__.py
index bf83e9673..adfbe85e3 100644
--- a/lib/sqlalchemy/testing/__init__.py
+++ b/lib/sqlalchemy/testing/__init__.py
@@ -24,7 +24,8 @@ from .assertions import emits_warning, emits_warning_on, uses_deprecated, \
     AssertsExecutionResults, expect_deprecated, expect_warnings
 
 from .util import run_as_contextmanager, rowset, fail, \
-    provide_metadata, adict, force_drop_names
+    provide_metadata, adict, force_drop_names, \
+    teardown_events
 
 crashes = skip
 
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
index 1842e58a5..e9437948a 100644
--- a/lib/sqlalchemy/testing/util.py
+++ b/lib/sqlalchemy/testing/util.py
@@ -267,3 +267,14 @@ def drop_all_tables(engine, inspector, schema=None, include_names=None):
                         ForeignKeyConstraint(
                             [tb.c.x], [tb.c.y], name=fkc)
                     ))
+
+
+def teardown_events(event_cls):
+    @decorator
+    def decorate(fn, *arg, **kw):
+        try:
+            return fn(*arg, **kw)
+        finally:
+            event_cls._clear()
+    return decorate
+