Merge with master again

Some bugs were still present in master
This commit is contained in:
Dave Halter
2018-01-20 21:45:55 +01:00
6 changed files with 19 additions and 6 deletions

View File

@@ -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'