Fixes: debbugs:18962
* lisp/progmodes/python.el (python-eldoc-setup-code): Enhance string
type checks, simplify printing.
+2014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org>
+
+ * progmodes/python.el (python-eldoc-setup-code): Enhance string
+ type checks, simplify printing. (Bug#18962)
+
2014-11-14 Ivan Andrus <darthandrus@gmail.com>
* progmodes/python.el (python-shell-font-lock-kill-buffer):
"def __PYDOC_get_help(obj):
try:
import inspect
- if hasattr(obj, 'startswith'):
+ try:
+ str_type = basestring
+ except NameError:
+ str_type = str
+ if isinstance(obj, str_type):
obj = eval(obj, globals())
doc = inspect.getdoc(obj)
if not doc and callable(obj):
doc = doc.splitlines()[0]
except:
doc = ''
- try:
- exec('print doc')
- except SyntaxError:
- print(doc)"
+ print (doc)"
"Python code to setup documentation retrieval."
:type 'string
:group 'python)