Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
This commit is contained in:
Dave Halter
2018-01-20 18:58:43 +01:00
48 changed files with 205 additions and 210 deletions

View File

@@ -15,9 +15,9 @@ def test_paths_from_assignment(Script):
expr_stmt = script._get_module_node().children[0]
return set(sys_path._paths_from_assignment(script._get_module(), expr_stmt))
assert paths('sys.path[0:0] = ["a"]') == set(['/foo/a'])
assert paths('sys.path = ["b", 1, x + 3, y, "c"]') == set(['/foo/b', '/foo/c'])
assert paths('sys.path = a = ["a"]') == set(['/foo/a'])
assert paths('sys.path[0:0] = ["a"]') == {'/foo/a'}
assert paths('sys.path = ["b", 1, x + 3, y, "c"]') == {'/foo/b', '/foo/c'}
assert paths('sys.path = a = ["a"]') == {'/foo/a'}
# Fail for complicated examples.
assert paths('sys.path, other = ["a"], 2') == set()