diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-14 12:22:40 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-15 10:01:53 -0500 |
| commit | 150ccf1716a41439c6ed9b06ac9cbf68fa5db1c4 (patch) | |
| tree | 4792d2f737b27b18d405855b4ab3c55555839827 /lib/sqlalchemy/event | |
| parent | b229a50c7786d8cbe65a2bf471b57a806f4259e3 (diff) | |
| download | sqlalchemy-150ccf1716a41439c6ed9b06ac9cbf68fa5db1c4.tar.gz | |
move to inspect_getfullargspec
Replace inspect_getargspec with inspect_getfullargspec
including a compatibility fallback for Py2k and use
getfullargspec fully.
Change-Id: I92bce0aafc37ce1a360b4f61b75f5892d0911c7e
Diffstat (limited to 'lib/sqlalchemy/event')
| -rw-r--r-- | lib/sqlalchemy/event/attr.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/event/legacy.py | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/event/attr.py b/lib/sqlalchemy/event/attr.py index f0f65e670..9dfa89809 100644 --- a/lib/sqlalchemy/event/attr.py +++ b/lib/sqlalchemy/event/attr.py @@ -81,9 +81,9 @@ class _ClsLevelDispatch(RefCollection): def __init__(self, parent_dispatch_cls, fn): self.name = fn.__name__ - argspec = util.inspect_getargspec(fn) + argspec = util.inspect_getfullargspec(fn) self.arg_names = argspec.args[1:] - self.has_kw = bool(argspec.keywords) + self.has_kw = bool(argspec.varkw) self.legacy_signatures = list( reversed( sorted( diff --git a/lib/sqlalchemy/event/legacy.py b/lib/sqlalchemy/event/legacy.py index 049df81aa..93b6a1a9a 100644 --- a/lib/sqlalchemy/event/legacy.py +++ b/lib/sqlalchemy/event/legacy.py @@ -32,7 +32,7 @@ def _wrap_fn_for_legacy(dispatch_collection, fn, argspec): has_kw = False if len(argnames) == len(argspec.args) and has_kw is bool( - argspec.keywords + argspec.varkw ): if conv: @@ -140,7 +140,7 @@ def _version_signature_changes(parent_dispatch_cls, dispatch_collection): " The :class:`.%(clsname)s.%(event_name)s` event now accepts the \n" " arguments ``%(named_event_arguments)s%(has_kw_arguments)s``.\n" " Support for listener functions which accept the previous \n" - " argument signature(s) listed above as \"deprecated\" will be \n" + ' argument signature(s) listed above as "deprecated" will be \n' " removed in a future release." % { "since": since, @@ -171,6 +171,7 @@ def _augment_fn_docs(dispatch_collection, parent_dispatch_cls, fn): ) text += _version_signature_changes( - parent_dispatch_cls, dispatch_collection) + parent_dispatch_cls, dispatch_collection + ) return util.inject_docstring_text(fn.__doc__, text, 1) |