VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Python 2 compatibility

Browse Source
This commit is contained in:
Dave Halter
2019-08-06 00:36:50 +02:00
parent 4b8505b78d
commit 98a550e352
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/evaluate/context/module.py
View File

@@ -26,8 +26,11 @@ class _ModuleAttributeName(AbstractNameDefinition):
def infer(self): def infer(self):
if self._string_value is not None: if self._string_value is not None:
s = self._string_value
if self.parent_context.evaluator.environment.version_info.major == 2:
s = bytes(s)
return ContextSet([ return ContextSet([
create_simple_object(self.parent_context.evaluator, self._string_value) create_simple_object(self.parent_context.evaluator, s)
]) ])
return compiled.get_string_context_set(self.parent_context.evaluator) return compiled.get_string_context_set(self.parent_context.evaluator)

6
test/test_api/test_completion.py
View File

@@ -166,8 +166,8 @@ def test_keyword_completion(Script, code, has_keywords):
(None, '"test', None, [s]), (None, '"test', None, [s]),
(None, '"test', 4, ['t' + s]), (None, '"test', 4, ['t' + s]),
('example.py', '"test%scomp' % s, None, ['letion' + s]), ('example.py', '"test%scomp' % s, None, ['letion' + s]),
('example.py', 'r"comp"', None, ...), ('example.py', 'r"comp"', None, "A LOT"),
('example.py', 'r"tes"', None, ...), ('example.py', 'r"tes"', None, "A LOT"),
('example.py', 'r"tes"', 5, ['t' + s]), ('example.py', 'r"tes"', 5, ['t' + s]),
('example.py', 'r" tes"', 6, []), ('example.py', 'r" tes"', 6, []),
('test%sexample.py' % s, 'r"tes"', 5, ['t' + s]), ('test%sexample.py' % s, 'r"tes"', 5, ['t' + s]),
@@ -203,7 +203,7 @@ def test_file_path_completions(Script, file, code, column, expected):
if isinstance(column, tuple): if isinstance(column, tuple):
line, column = column line, column = column
comps = Script(code, path=file, line=line, column=column).completions() comps = Script(code, path=file, line=line, column=column).completions()
if expected == ...: if expected == "A LOT":
assert len(comps) > 100 # This is basically global completions. assert len(comps) > 100 # This is basically global completions.
else: else:
assert [c.complete for c in comps] == expected assert [c.complete for c in comps] == expected