merged dev and linter

2014-07-17 23:17:45 +02:00
parent a1bc644bfb 9eec2b2794
commit 08f7a439c0
16 changed files with 321 additions and 153 deletions
--- a/jedi/api/init.py
+++ b/jedi/api/init.py
@@ -349,7 +349,7 @@ class Script(object):
           Use :attr:`.call_signatures` instead.
        .. todo:: Remove!
        """
-        warnings.warn("Use line instead.", DeprecationWarning)
+        warnings.warn("Use call_signatures instead.", DeprecationWarning)
        sig = self.call_signatures()
        return sig[0] if sig else None