Merge branch 'py314' of https://github.com/frenzymadness/jedi into py314

test/test_api/test_interpreter.py

@@ -664,7 +664,7 @@ def bar():
         ({'return': 'typing.Union["str", int]'},
          ['int', 'str'] if sys.version_info >= (3, 9) else ['int'], ''),
         ({'return': 'typing.Union["str", 1]'},
-         ['str'] if sys.version_info >= (3, 11) else [], ''),
+         [] if sys.version_info >= (3, 14) else (['str'] if sys.version_info >= (3, 11) else []), ''),
         ({'return': 'typing.Optional[str]'}, ['NoneType', 'str'], ''),
         ({'return': 'typing.Optional[str, int]'}, [], ''),  # Takes only one arg
         ({'return': 'typing.Any'},
@@ -746,7 +746,8 @@ def test_complete_not_findable_class_source():
 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_utils.py

@@ -83,6 +83,9 @@ class TestSetupReadline(unittest.TestCase):
             '_', 'O_', 'EX_', 'EFD_', 'MFD_', 'TFD_',
             'SF_', 'ST_', 'CLD_', 'POSIX_SPAWN_', 'P_',
             'RWF_', 'CLONE_', 'SCHED_', 'SPLICE_',
+            # Python 3.15+ new constants
+            'AT_', 'PIDFD_', 'STATX_', 'GRND_', 'XATTR_',
+            'RTLD_', 'PRIO_', 'F_', 'SEEK_', 'NODEV',
         ]
         difference = {
             x for x in difference