From 5a20cd166585e91e9db4a425ab4a4ea23e8905ac Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 4 Nov 2012 11:26:06 +0100 Subject: [PATCH] Use AttributeError instead of hasattr --- jedi/api.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jedi/api.py b/jedi/api.py index 977ad601..169b4afe 100644 --- a/jedi/api.py +++ b/jedi/api.py @@ -75,10 +75,11 @@ class Completion(object): """ Return a document string for this completion object. """ try: parent = self.name.parent() - docstr = str(parent.docstr) - if hasattr(parent, 'get_call_signature'): - docstr = parent.get_call_signature() + '\n\n' + docstr - return docstr + try: + return '%s\n\n%s' % (parent.get_call_signature(), + parent.docstr) + except AttributeError: + return str(parent.docstr) except AttributeError: return ''