VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 06:24:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge with master

Browse Source 
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
parent 19b3580ba7 877383b110
commit d986c44b94
48 changed files with 205 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/conftest.py
View File

@@ -41,9 +41,9 @@ def parse_test_files_option(opt):
opt = str(opt)
if ':' in opt:
(f_name, rest) = opt.split(':', 1)
return (f_name, list(map(int, rest.split(','))))
return f_name, list(map(int, rest.split(',')))
else:
return (opt, [])
return opt, []
def pytest_generate_tests(metafunc):
@@ -127,7 +127,7 @@ class StaticAnalysisCase(object):
@pytest.fixture()
def cwd_tmpdir(monkeypatch, tmpdir):
with helpers.set_cwd(tmpdir.dirpath):
with helpers.set_cwd(tmpdir.strpath):
yield tmpdir