[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 a2244f4 5/5: Improve python3-compatibility of fal
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 a2244f4 5/5: Improve python3-compatibility of fallback completion (Bug#28499) |
Date: |
Mon, 25 Sep 2017 19:40:15 -0400 (EDT) |
branch: emacs-26
commit a2244f417a7cf577172cec927b055f0aca9ef282
Author: Joerg Behrmann <address@hidden>
Commit: Noam Postavsky <address@hidden>
Improve python3-compatibility of fallback completion (Bug#28499)
* lisp/progmodes/python.el (python-eldoc-setup-code): Use
inspect.getfullargspec instead of inspect.getargspec to avoid a
deprecation warning on every usage of eldoc in python-mode.
Copyright-paperwork-exempt: yes
---
lisp/progmodes/python.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f3513ce..365191c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4271,8 +4271,10 @@ See `python-check-command' for the default."
import inspect
try:
str_type = basestring
+ argspec_function = inspect.getargspec
except NameError:
str_type = str
+ argspec_function = inspect.getfullargspec
if isinstance(obj, str_type):
obj = eval(obj, globals())
doc = inspect.getdoc(obj)
@@ -4285,9 +4287,7 @@ See `python-check-command' for the default."
target = obj
objtype = 'def'
if target:
- args = inspect.formatargspec(
- *inspect.getargspec(target)
- )
+ args = inspect.formatargspec(*argspec_function(target))
name = obj.__name__
doc = '{objtype} {name}{args}'.format(
objtype=objtype, name=name, args=args