diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-01-15 19:19:00 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-01-15 19:19:00 -0500 |
| commit | 8c2f7e93251aee86553a09ff4122e92c783f25e5 (patch) | |
| tree | 5cd77f06f7c26cf8c694878dda518e06f1d64784 | |
| parent | a5a6643a95dd00ec653150335ae6bf03b445c9e5 (diff) | |
| parent | b5bddb2ca17fe2e711b69205d9ed809dbfc77bfa (diff) | |
| download | sqlalchemy-8c2f7e93251aee86553a09ff4122e92c783f25e5.tar.gz | |
Merge remote-tracking branch 'origin/pr/5077'
Change-Id: Ie8e0d631f7c6271bcd8173065506e85130b754c4
| -rw-r--r-- | lib/sqlalchemy/event/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/fixtures.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/event/base.py b/lib/sqlalchemy/event/base.py index 0fe11490a..2eb8846f6 100644 --- a/lib/sqlalchemy/event/base.py +++ b/lib/sqlalchemy/event/base.py @@ -161,7 +161,7 @@ class _EventMeta(type): def __init__(cls, classname, bases, dict_): _create_dispatcher_class(cls, classname, bases, dict_) - return type.__init__(cls, classname, bases, dict_) + type.__init__(cls, classname, bases, dict_) def _create_dispatcher_class(cls, classname, bases, dict_): diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py index daf534215..62bf9fc1f 100644 --- a/lib/sqlalchemy/testing/fixtures.py +++ b/lib/sqlalchemy/testing/fixtures.py @@ -330,7 +330,7 @@ class MappedTest(_ORMTest, TablesTest, assertions.AssertsExecutionResults): class FindFixture(type): def __init__(cls, classname, bases, dict_): cls_registry[classname] = cls - return type.__init__(cls, classname, bases, dict_) + type.__init__(cls, classname, bases, dict_) class _Base(util.with_metaclass(FindFixture, object)): pass |