Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
2018-01-20 18:58:43 +01:00
parent 19b3580ba7 877383b110
commit d986c44b94
48 changed files with 205 additions and 210 deletions
--- a/jedi/utils.py
+++ b/jedi/utils.py
@@ -89,7 +89,7 @@ def setup_readline(namespace_module=__main__):
                    lines = split_lines(text)
                    position = (len(lines), len(lines[-1]))
                    name = get_on_completion_name(
-                        interpreter._get_module_node(),
+                        interpreter._module_node,
                        lines,
                        position
                    )