From: Iryna Shcherbina <ishcherb@redhat.com>
Date: Tue, 26 Sep 2017 06:32:12 +0000 (+0200)
Subject: Fix noseplugin to accept `zeroarg_callback` for `--dbs` option
X-Git-Tag: origin~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e002c87b343a4e7f103cc8aef922b0e63856d29;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix noseplugin to accept `zeroarg_callback` for `--dbs` option

./sqla_nose.py --dbs  works fine with zero arguments, so `zeroarg_callback` should be treated as `callback`.
---

diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py
index 2cf95d8d85..1dd6494d77 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)