updated jedi to 0.9.0

Author: DonJayamanne

pythonFiles/jedi/__init__.py

@@ -25,7 +25,7 @@ def find_module_py33(string, path=None):
         except ValueError as e:
             # See #491. Importlib might raise a ValueError, to avoid this, we
             # just raise an ImportError to fix the issue.
-            raise ImportError("Originally  " + repr(e))
+            raise ImportError("Originally ValueError: " + e.message)
 
     if loader is None:
         raise ImportError("Couldn't find a loader for {0}".format(string))

pythonFiles/jedi/__main__.py

@@ -62,8 +62,8 @@ class Script(object):
     :type source: str
     :param line: The line to perform actions on (starting with 1).
     :type line: int
-    :param column: The column of the cursor (starting with 0).
-    :type column: int
+    :param col: The column of the cursor (starting with 0).
+    :type col: int
     :param path: The path of the file in the file system, or ``''`` if
         it hasn't been saved yet.
     :type path: str or None
@@ -157,7 +157,7 @@ def get_completions(user_stmt, bs):
                     if unfinished_dotted:
                         return completion_names
                     else:
-                        return set([keywords.keyword('import').name])
+                        return keywords.keyword_names('import')
 
             if isinstance(user_stmt, tree.Import):
                 module = self._parser.module()
@@ -168,11 +168,7 @@ def get_completions(user_stmt, bs):
             if names is None and not isinstance(user_stmt, tree.Import):
                 if not path and not dot:
                     # add keywords
-                    completion_names += keywords.completion_names(
-                        self._evaluator,
-                        user_stmt,
-                        self._pos,
-                        module)
+                    completion_names += keywords.keyword_names(all=True)
                     # TODO delete? We should search for valid parser
                     # transformations.
                 completion_names += self._simple_complete(path, dot, like)

pythonFiles/jedi/_compatibility.py

@@ -5,7 +5,7 @@
 from jedi import common
 from jedi.evaluate import compiled
 from jedi.evaluate.helpers import FakeName
-from jedi.parser.tree import Leaf
+
 try:
     from pydoc_data import topics as pydoc_topics
 except ImportError:
@@ -18,49 +18,22 @@
     keys = keyword.kwlist + ['None', 'False', 'True']
 
 
-def has_inappropriate_leaf_keyword(pos, module):
-    relevant_errors = filter(
-        lambda error: error.first_pos[0] == pos[0],
-        module.error_statement_stacks)
-
-    for error in relevant_errors:
-        if error.next_token in keys:
-            return True
-
-    return False
-
-def completion_names(evaluator, stmt, pos, module):
-    keyword_list = all_keywords()
-
-    if not isinstance(stmt, Leaf) or has_inappropriate_leaf_keyword(pos, module):
-        keyword_list = filter(
-            lambda keyword: not keyword.only_valid_as_leaf,
-            keyword_list
-        )
-    return [keyword.name for keyword in keyword_list]
-
-
-def all_keywords(pos=(0,0)):
-    return set([Keyword(k, pos) for k in keys])
+def keywords(string='', pos=(0, 0), all=False):
+    if all:
+        return set([Keyword(k, pos) for k in keys])
+    if string in keys:
+        return set([Keyword(string, pos)])
+    return set()
 
 
-def keyword(string, pos=(0,0)):
-    if string in keys:
-        return Keyword(string, pos)
-    else:
-        return None
+def keyword_names(*args, **kwargs):
+    return [k.name for k in keywords(*args, **kwargs)]
 
 
 def get_operator(string, pos):
     return Keyword(string, pos)
 
 
-keywords_only_valid_as_leaf = (
-    'continue',
-    'break',
-)
-
-
 class Keyword(object):
     def __init__(self, name, pos):
         self.name = FakeName(name, self, pos)
@@ -70,10 +43,6 @@ def __init__(self, name, pos):
     def get_parent_until(self):
         return self.parent
 
-    @property
-    def only_valid_as_leaf(self):
-        return self.name.value in keywords_only_valid_as_leaf
-
     @property
     def names(self):
         """ For a `parsing.Name` like comparision """

pythonFiles/jedi/api/__init__.py

@@ -3,15 +3,6 @@
 import os
 import time
 
-def _lazy_colorama_init():
-    """lazily init colorama if necessary, not to screw up stdout is debug not enabled.
-
-    This version of the function does nothing.
-    """
-    pass
-
-_inited=False
-
 try:
     if os.name == 'nt':
         # does not work on Windows, as pyreadline and colorama interfere
@@ -20,19 +11,10 @@ def _lazy_colorama_init():
         # Use colorama for nicer console output.
         from colorama import Fore, init
         from colorama import initialise
-        def _lazy_colorama_init():
-            """lazily init colorama if necessary, not to screw up stdout is debug not enabled.
-
-            This version of the function does init colorama.
-            """
-            global _inited
-            if not _inited:
-                # pytest resets the stream at the end - causes troubles. Since after
-                # every output the stream is reset automatically we don't need this.
-                initialise.atexit_done = True
-                init()
-            _inited = True
-
+        # pytest resets the stream at the end - causes troubles. Since after
+        # every output the stream is reset automatically we don't need this.
+        initialise.atexit_done = True
+        init()
 except ImportError:
     class Fore(object):
         RED = ''
@@ -81,7 +63,6 @@ def dbg(message, *args):
         mod = inspect.getmodule(frm[0])
         if not (mod.__name__ in ignored_modules):
             i = ' ' * _debug_indent
-            _lazy_colorama_init()
             debug_function(NOTICE, i + 'dbg: ' + message % tuple(u(repr(a)) for a in args))
 
 
@@ -100,7 +81,6 @@ def speed(name):
 
 def print_to_stdout(level, str_out):
     """ The default debug function """
-    _lazy_colorama_init()
     if level == NOTICE:
         col = Fore.GREEN
     elif level == WARNING:

pythonFiles/jedi/api/classes.py

@@ -242,7 +242,7 @@ def _eval_atom(self, atom):
             except (IndexError, AttributeError):
                 pass
             else:
-                if isinstance(comp_for, tree.CompFor) and c[0] != '{':
+                if isinstance(comp_for, tree.CompFor):
                     return [iterable.Comprehension.from_atom(self, atom)]
             return [iterable.Array(self, atom)]
 

pythonFiles/jedi/api/helpers.py

@@ -207,21 +207,6 @@ class dict():
         return d
 
 
-class enumerate():
-    def __init__(self, sequence, start=0):
-        self.__sequence = sequence
-
-    def __iter__(self):
-        for i in self.__sequence:
-            yield 1, i
-
-    def __next__(self):
-        return next(self.__iter__())
-
-    def next(self):
-        return next(self.__iter__())
-
-
 class reversed():
     def __init__(self, sequence):
         self.__sequence = sequence

pythonFiles/jedi/api/interpreter.py

@@ -248,10 +248,6 @@ def end_pos(self):
         return end_pos_line, end_pos_col
 
 
-    @utf8_repr
-    def __repr__(self):
-        return "<%s: %r>" % (type(self).__name__, self.value)
-
 class Whitespace(LeafWithNewLines):
     """Contains NEWLINE and ENDMARKER tokens."""
     __slots__ = ()