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

Eliminate is_py3 usages

Browse Source
This commit is contained in:
Dave Halter
2017-12-28 01:55:39 +01:00
parent 6b6795c40c
commit d1d4986667
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jedi/_compatibility.py
View File

@@ -18,7 +18,6 @@ except ImportError:
is_py3 = sys.version_info[0] >= 3 is_py3 = sys.version_info[0] >= 3
is_py33 = is_py3 and sys.version_info[1] >= 3 is_py33 = is_py3 and sys.version_info[1] >= 3
is_py34 = is_py3 and sys.version_info[1] >= 4 is_py34 = is_py3 and sys.version_info[1] >= 4
is_py35 = is_py3 and sys.version_info[1] >= 5
is_py26 = not is_py3 and sys.version_info[1] < 7 is_py26 = not is_py3 and sys.version_info[1] < 7
py_version = int(str(sys.version_info[0]) + str(sys.version_info[1])) py_version = int(str(sys.version_info[0]) + str(sys.version_info[1]))

2
jedi/evaluate/compiled/fake.py
View File

@@ -7,7 +7,7 @@ mixing in Python code, the autocompletion should work much better for builtins.
import os import os
from itertools import chain from itertools import chain
from jedi._compatibility import is_py3, unicode from jedi._compatibility import unicode
fake_modules = {} fake_modules = {}

8
jedi/evaluate/compiled/subprocess/__init__.py
View File

@@ -300,8 +300,8 @@ class AccessHandle(object):
@memoize_method @memoize_method
def _cached_results(self, name, *args, **kwargs): def _cached_results(self, name, *args, **kwargs):
if type(self._subprocess) == EvaluatorSubprocess: #if type(self._subprocess) == EvaluatorSubprocess:
print(name, args, kwargs, #print(name, args, kwargs,
self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs) #self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs)
) #)
return self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs) return self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs)

6
jedi/evaluate/context/instance.py
View File

@@ -1,6 +1,5 @@
from abc import abstractproperty from abc import abstractproperty
from jedi._compatibility import is_py3
from jedi import debug from jedi import debug
from jedi.evaluate import compiled from jedi.evaluate import compiled
from jedi.evaluate import filters from jedi.evaluate import filters
@@ -136,7 +135,10 @@ class AbstractInstanceContext(Context):
for generator in self.execute_function_slots(iter_slot_names): for generator in self.execute_function_slots(iter_slot_names):
if isinstance(generator, AbstractInstanceContext): if isinstance(generator, AbstractInstanceContext):
# `__next__` logic. # `__next__` logic.
name = '__next__' if is_py3 else 'next' if self.evaluator.environment.version_info.major == 2:
name = 'next'
else:
name = '__next__'
iter_slot_names = generator.get_function_slot_names(name) iter_slot_names = generator.get_function_slot_names(name)
if iter_slot_names: if iter_slot_names:
yield LazyKnownContexts( yield LazyKnownContexts(

1
jedi/evaluate/filters.py
View File

@@ -6,7 +6,6 @@ from abc import abstractmethod
from parso.tree import search_ancestor from parso.tree import search_ancestor
from jedi._compatibility import is_py3
from jedi.evaluate import flow_analysis from jedi.evaluate import flow_analysis
from jedi.evaluate.base_context import ContextSet, Context from jedi.evaluate.base_context import ContextSet, Context
from jedi.parser_utils import get_parent_scope from jedi.parser_utils import get_parent_scope

7
jedi/parser_utils.py
View File

@@ -1,7 +1,7 @@
import textwrap import textwrap
from inspect import cleandoc from inspect import cleandoc
from jedi._compatibility import literal_eval, is_py3 from jedi._compatibility import literal_eval, force_unicode
from parso.python import tree from parso.python import tree
_EXECUTE_NODES = set([ _EXECUTE_NODES = set([
@@ -112,10 +112,7 @@ def clean_scope_docstring(scope_node):
cleaned = cleandoc(safe_literal_eval(node.value)) cleaned = cleandoc(safe_literal_eval(node.value))
# Since we want the docstr output to be always unicode, just # Since we want the docstr output to be always unicode, just
# force it. # force it.
if is_py3 or isinstance(cleaned, unicode): return force_unicode(cleaned)
return cleaned
else:
return unicode(cleaned, 'UTF-8', 'replace')
return '' return ''