Merge with master again

Some bugs were still present in master

test/test_api/test_unicode.py

@@ -68,7 +68,7 @@ def test_complete_at_zero(Script):
 def test_wrong_encoding(Script, cwd_tmpdir):
     x = cwd_tmpdir.join('x.py')
     # Use both latin-1 and utf-8 (a really broken file).
-    x.write_binary(u'foobar = 1\nä'.encode('latin-1') + 'ä'.encode())
+    x.write_binary(u'foobar = 1\nä'.encode('latin-1') + u'ä'.encode('utf-8'))
 
     c, = Script('import x; x.foo', sys_path=['.']).completions()
     assert c.name == 'foobar'

test/test_evaluate/test_precedence.py

@@ -12,6 +12,6 @@ def test_equals(Script, environment, source):
     if environment.version_info.major < 3:
         pytest.skip("Ellipsis does not exists in 2")
     script = Script(source)
-    node = script._get_module_node().children[0]
+    node = script._module_node.children[0]
     first, = script._get_module().eval_node(node)
     assert isinstance(first, CompiledObject) and first.get_safe_value() is True

test/test_evaluate/test_sys_path.py

@@ -12,7 +12,7 @@ from jedi.api.environment import Environment
 def test_paths_from_assignment(Script):
     def paths(src):
         script = Script(src, path='/foo/bar.py')
-        expr_stmt = script._get_module_node().children[0]
+        expr_stmt = script._module_node.children[0]
         return set(sys_path._paths_from_assignment(script._get_module(), expr_stmt))
 
     assert paths('sys.path[0:0] = ["a"]') == {'/foo/a'}