diff --git a/jedi/_compatibility.py b/jedi/_compatibility.py index d9df3b22..6bccd3a1 100644 --- a/jedi/_compatibility.py +++ b/jedi/_compatibility.py @@ -426,17 +426,6 @@ def highest_pickle_protocol(python_versions): return protocol -try: - from inspect import Parameter -except ImportError: - class Parameter(object): - POSITIONAL_ONLY = object() - POSITIONAL_OR_KEYWORD = object() - VAR_POSITIONAL = object() - KEYWORD_ONLY = object() - VAR_KEYWORD = object() - - class GeneralizedPopen(subprocess.Popen): def __init__(self, *args, **kwargs): if os.name == 'nt': diff --git a/jedi/api/completion.py b/jedi/api/completion.py index 90b03541..0e9d140c 100644 --- a/jedi/api/completion.py +++ b/jedi/api/completion.py @@ -1,12 +1,12 @@ import re from textwrap import dedent +from inspect import Parameter from parso.python.token import PythonTokenTypes from parso.python import tree from parso.tree import search_ancestor, Leaf from parso import split_lines -from jedi._compatibility import Parameter from jedi import debug from jedi import settings from jedi.api import classes diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py index 0463b893..f9e7d8b6 100644 --- a/jedi/api/helpers.py +++ b/jedi/api/helpers.py @@ -6,11 +6,12 @@ from collections import namedtuple from textwrap import dedent from itertools import chain from functools import wraps +from inspect import Parameter from parso.python.parser import Parser from parso.python import tree -from jedi._compatibility import u, Parameter +from jedi._compatibility import u from jedi.inference.base_value import NO_VALUES from jedi.inference.syntax_tree import infer_atom from jedi.inference.helpers import infer_call_of_leaf diff --git a/jedi/inference/compiled/value.py b/jedi/inference/compiled/value.py index 61b134ad..6cf08bc5 100644 --- a/jedi/inference/compiled/value.py +++ b/jedi/inference/compiled/value.py @@ -3,10 +3,11 @@ Imitate the parser representation. """ import re from functools import partial +from inspect import Parameter from jedi import debug from jedi.inference.utils import to_list -from jedi._compatibility import force_unicode, Parameter, cast_path +from jedi._compatibility import force_unicode, cast_path from jedi.cache import memoize_method from jedi.inference.filters import AbstractFilter from jedi.inference.names import AbstractNameDefinition, ValueNameMixin, \ diff --git a/jedi/inference/gradual/annotation.py b/jedi/inference/gradual/annotation.py index 05416111..77a8abc5 100644 --- a/jedi/inference/gradual/annotation.py +++ b/jedi/inference/gradual/annotation.py @@ -6,10 +6,10 @@ as annotations in future python versions. """ import re +from inspect import Parameter from parso import ParserSyntaxError, parse -from jedi._compatibility import force_unicode, Parameter from jedi.inference.cache import inference_state_method_cache from jedi.inference.base_value import ValueSet, NO_VALUES from jedi.inference.gradual.base import DefineGenericBaseClass, GenericClass diff --git a/jedi/inference/names.py b/jedi/inference/names.py index ccf42d4c..73c0a1d9 100644 --- a/jedi/inference/names.py +++ b/jedi/inference/names.py @@ -1,8 +1,8 @@ from abc import abstractmethod +from inspect import Parameter from parso.tree import search_ancestor -from jedi._compatibility import Parameter from jedi.parser_utils import find_statement_documentation, clean_scope_docstring from jedi.inference.utils import unite from jedi.inference.base_value import ValueSet, NO_VALUES diff --git a/jedi/inference/param.py b/jedi/inference/param.py index c1ce541a..a4bee9a2 100644 --- a/jedi/inference/param.py +++ b/jedi/inference/param.py @@ -1,4 +1,5 @@ from collections import defaultdict +from inspect import Parameter from jedi import debug from jedi.inference.utils import PushBackIterator @@ -6,7 +7,6 @@ from jedi.inference import analysis from jedi.inference.lazy_value import LazyKnownValue, \ LazyTreeValue, LazyUnknownValue from jedi.inference.value import iterable -from jedi._compatibility import Parameter from jedi.inference.names import ParamName diff --git a/jedi/inference/signature.py b/jedi/inference/signature.py index 77d3960d..b0a98eb0 100644 --- a/jedi/inference/signature.py +++ b/jedi/inference/signature.py @@ -1,4 +1,5 @@ -from jedi._compatibility import Parameter +from inspect import Parameter + from jedi.cache import memoize_method from jedi import debug from jedi import parser_utils diff --git a/jedi/inference/star_args.py b/jedi/inference/star_args.py index 0cda3839..78ec8a0b 100644 --- a/jedi/inference/star_args.py +++ b/jedi/inference/star_args.py @@ -10,8 +10,8 @@ This means for example in this case:: The signature here for bar should be `bar(b, c)` instead of bar(*args). """ +from inspect import Parameter -from jedi._compatibility import Parameter from jedi.inference.utils import to_list from jedi.inference.names import ParamNameWrapper from jedi.inference.helpers import is_big_annoying_library diff --git a/jedi/plugins/django.py b/jedi/plugins/django.py index 88a3bfae..33e2faf3 100644 --- a/jedi/plugins/django.py +++ b/jedi/plugins/django.py @@ -1,7 +1,8 @@ """ Module is used to infer Django model fields. """ -from jedi._compatibility import Parameter +from inspect import Parameter + from jedi import debug from jedi.inference.cache import inference_state_function_cache from jedi.inference.base_value import ValueSet, iterator_to_value_set, ValueWrapper diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py index 5e093e72..dc097ac3 100644 --- a/jedi/plugins/stdlib.py +++ b/jedi/plugins/stdlib.py @@ -11,8 +11,9 @@ compiled module that returns the types for C-builtins. """ import parso import os +from inspect import Parameter -from jedi._compatibility import force_unicode, Parameter +from jedi._compatibility import force_unicode from jedi import debug from jedi.inference.utils import safe_property from jedi.inference.helpers import get_str_or_none