diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-26 11:49:31 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-26 11:49:31 -0400 |
| commit | ac1c19dee7d5ac784a7c913b1555f58d9cd4ec80 (patch) | |
| tree | fcba4479f6ff3e1e587c44eb25dda003b8eb9565 /lib/sqlalchemy | |
| parent | 21af7fc4aa9a97e30846b7d95a6d53928e4f11d2 (diff) | |
| parent | 8e002c87b343a4e7f103cc8aef922b0e63856d29 (diff) | |
| download | sqlalchemy-ac1c19dee7d5ac784a7c913b1555f58d9cd4ec80.tar.gz | |
Merge branch 'patch-1' of https://github.com/irushchyshyn/sqlalchemy
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/noseplugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py index 2cf95d8d8..1dd6494d7 100644 --- a/lib/sqlalchemy/testing/plugin/noseplugin.py +++ b/lib/sqlalchemy/testing/plugin/noseplugin.py @@ -41,7 +41,7 @@ class NoseSQLAlchemy(Plugin): opt = parser.add_option def make_option(name, **kw): - callback_ = kw.pop("callback", None) + callback_ = kw.pop("callback", None) or kw.pop("zeroarg_callback", None) if callback_: def wrap_(option, opt_str, value, parser): callback_(opt_str, value, parser) |