Merge pull request #2097 from davidhalter/py314

Python 3.14; fixes #2093, fixes #2070, will fix #2064 after release.

Author: davidhalter

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04, windows-2022]
-        python-version: ["3.13", "3.12", "3.11", "3.10"]
-        environment: ['3.13', '3.12', '3.11', '3.10', 'interpreter']
+        python-version: ["3.14", "3.13", "3.12", "3.11", "3.10"]
+        environment: ['3.14', '3.13', '3.12', '3.11', '3.10', 'interpreter']
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

jedi/api/environment.py

@@ -22,7 +22,7 @@
 
 _VersionInfo = namedtuple('VersionInfo', 'major minor micro')  # type: ignore[name-match]
 
-_SUPPORTED_PYTHONS = ['3.13', '3.12', '3.11', '3.10']
+_SUPPORTED_PYTHONS = ['3.14', '3.13', '3.12', '3.11', '3.10']
 _SAFE_PATHS = ['/usr/bin', '/usr/local/bin']
 _CONDA_VAR = 'CONDA_PREFIX'
 _CURRENT_VERSION = '%s.%s' % (sys.version_info.major, sys.version_info.minor)

jedi/inference/compiled/access.py

@@ -471,18 +471,23 @@ def execute_operation(self, other_access_handle, operator):
         op = _OPERATORS[operator]
         return self._create_access_path(op(self._obj, other_access._obj))
 
-    def get_annotation_name_and_args(self):
+    def get_annotation_name_and_args(self) -> tuple[str | None, tuple[AccessPath, ...]]:
         """
         Returns Tuple[Optional[str], Tuple[AccessPath, ...]]
         """
         name = None
         args = ()
-        if safe_getattr(self._obj, '__module__', default='') == 'typing':
+        if type(self._obj) is typing.Union:  # zuban: ignore[comparison-overlap]  # TODO zuban
+            # This is mostly formatted like `int | str` and we therefor need to
+            # check the type.
+            args = typing.get_args(self._obj)
+            name = "Union"
+        elif safe_getattr(self._obj, '__module__', default='') == 'typing':
+            # Try regex first (works for most types)
             m = re.match(r'typing.(\w+)\[', repr(self._obj))
             if m is not None:
                 name = m.group(1)
 
-                import typing
                 if sys.version_info >= (3, 8):
                     args = typing.get_args(self._obj)
                 else:
@@ -493,6 +498,18 @@ def needs_type_completions(self):
         return inspect.isclass(self._obj) and self._obj != type
 
     def _annotation_to_str(self, annotation):
+        # In Python 3.14+, Union types are displayed as X | Y instead of Union[X, Y]
+        # We normalize to that for consistency
+        import typing
+        origin = typing.get_origin(annotation)
+        if origin is typing.Union:
+            # Get the args and format them as Union[...]
+            args = typing.get_args(annotation)
+            return ' | '.join(
+                self._annotation_to_str(arg) if hasattr(arg, '__origin__')
+                else getattr(arg, '__name__', str(arg))
+                for arg in args
+            )
         return inspect.formatannotation(annotation)
 
     def get_signature_params(self):

jedi/inference/compiled/getattr_static.py

@@ -90,7 +90,10 @@ def getattr_static(obj, attr, default=_sentinel):
     if not _is_type(obj):
         klass = type(obj)
         dict_attr = _shadowed_dict(klass)
-        if (dict_attr is _sentinel or type(dict_attr) is types.MemberDescriptorType):
+        # In Python 3.15+, __dict__ is a GetSetDescriptorType instead of being _sentinel
+        if (dict_attr is _sentinel
+                or type(dict_attr) is types.MemberDescriptorType
+                or type(dict_attr) is types.GetSetDescriptorType):
             instance_result = _check_instance(obj, attr)
     else:
         klass = obj

setup.py

@@ -99,6 +99,7 @@
           'Programming Language :: Python :: 3.11',
           'Programming Language :: Python :: 3.12',
           'Programming Language :: Python :: 3.13',
+          'Programming Language :: Python :: 3.14',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: Text Editors :: Integrated Development Environments (IDE)',
           'Topic :: Utilities',

test/run.py

@@ -104,10 +104,7 @@
 import re
 import sys
 import operator
-if sys.version_info < (3, 8):
-    literal_eval = eval
-else:
-    from ast import literal_eval
+from ast import literal_eval
 from io import StringIO
 from functools import reduce
 from unittest.mock import ANY

test/test_api/test_call_signatures.py

@@ -420,7 +420,7 @@ def get(source, column=None):
     (code1, 'f(a,b,xy', 4),
     (code1, 'f(a,b,xyz=', 4),
     (code1, 'f(a,b,xy=', None),
-    (code1, 'f(u=', (0, None)),
+    (code1, 'f(u=', None),
     (code1, 'f(v=', 1),
 
     # **kwargs
@@ -438,7 +438,7 @@ def get(source, column=None):
     (code2, 'g(a,b,abc=1,abd=4,abd=', 5),
     (code2, 'g(a,b,kw', 5),
     (code2, 'g(a,b,kwargs=', 5),
-    (code2, 'g(u=', (0, 5)),
+    (code2, 'g(u=', 5),
     (code2, 'g(v=', 1),
 
     # *args
@@ -450,7 +450,7 @@ def get(source, column=None):
     (code3, 'h(a,b,c,(3,)', 2),
     (code3, 'h(a,b,args=', None),
     (code3, 'h(u,v=', 1),
-    (code3, 'h(u=', (0, None)),
+    (code3, 'h(u=', None),
     (code3, 'h(u,*xxx', 1),
     (code3, 'h(u,*xxx,*yyy', 1),
     (code3, 'h(u,*[]', 1),
@@ -483,7 +483,7 @@ def get(source, column=None):
     (code4, 'i(1, [a?b,*', 2),
     (code4, 'i(?b,*r,c', 1),
     (code4, 'i(?*', 0),
-    (code4, 'i(?**', (0, 1)),
+    (code4, 'i(?**', 1),
 
     # Random
     (code4, 'i(()', 0),
@@ -497,11 +497,6 @@ def get(source, column=None):
 @pytest.mark.parametrize('ending', ['', ')'])
 @pytest.mark.parametrize('code, call, expected_index', _calls)
 def test_signature_index(Script, environment, code, call, expected_index, ending):
-    if isinstance(expected_index, tuple):
-        expected_index = expected_index[environment.version_info > (3, 8)]
-    if environment.version_info < (3, 8):
-        code = code.replace('/,', '')
-
     sig, = Script(code + '\n' + call + ending).get_signatures(column=len(call))
     index = sig.index
     assert expected_index == index

test/test_api/test_environment.py

@@ -26,7 +26,7 @@ def test_find_system_environments():
 
 @pytest.mark.parametrize(
     'version',
-    ['3.10', '3.11', '3.12', '3.13']
+    jedi.api.environment._SUPPORTED_PYTHONS,
 )
 def test_versions(version):
     try:

test/test_api/test_interpreter.py

@@ -661,17 +661,15 @@ def bar():
 
         # typing is available via globals.
         ({'return': 'typing.Union[str, int]'}, ['int', 'str'], ''),
-        ({'return': 'typing.Union["str", int]'},
-         ['int', 'str'] if sys.version_info >= (3, 9) else ['int'], ''),
+        ({'return': 'typing.Union["str", int]'}, ['int', 'str'], ''),
         ({'return': 'typing.Union["str", 1]'},
-         ['str'] if sys.version_info >= (3, 11) else [], ''),
+         (['str'] if (3, 14) > sys.version_info >= (3, 11) else []), ''),
         ({'return': 'typing.Optional[str]'}, ['NoneType', 'str'], ''),
         ({'return': 'typing.Optional[str, int]'}, [], ''),  # Takes only one arg
         ({'return': 'typing.Any'},
          ['_AnyMeta'] if sys.version_info >= (3, 11) else [], ''),
 
-        ({'return': 'typing.Tuple[int, str]'},
-         ['Tuple' if sys.version_info[:2] == (3, 6) else 'tuple'], ''),
+        ({'return': 'typing.Tuple[int, str]'}, ['tuple'], ''),
         ({'return': 'typing.Tuple[int, str]'}, ['int'], 'x()[0]'),
         ({'return': 'typing.Tuple[int, str]'}, ['str'], 'x()[1]'),
         ({'return': 'typing.Tuple[int, str]'}, [], 'x()[2]'),
@@ -746,7 +744,8 @@ class TestClass():
 def test_param_infer_default():
     abs_sig, = jedi.Interpreter('abs(', [{'abs': abs}]).get_signatures()
     param, = abs_sig.params
-    assert param.name == 'x'
+    # Parameter name changed from 'x' to 'number' in Python 3.15
+    assert param.name in ('x', 'number')
     assert param.infer_default() == []
 
 

test/test_inference/test_gradual/test_stubs.py

@@ -43,8 +43,8 @@
     ])
 def test_infer_and_goto(Script, code, full_name, has_stub, has_python, way,
                         kwargs, type_, options, environment):
-    if type_ == 'infer' and full_name == 'typing.Sequence' and environment.version_info >= (3, 7):
-        # In Python 3.7+ there's not really a sequence definition, there's just
+    if type_ == 'infer' and full_name == 'typing.Sequence':
+        # Since Python 3.7+ there's not really a sequence definition, there's just
         # a name that leads nowhere.
         has_python = False