Merge branch 'main' into 3.6

Author: slozier

.github/workflows/main.yml

@@ -16,21 +16,21 @@ jobs:
     - name: Install tools
       if: matrix.os == 'ubuntu-22.04'
       run: sudo apt-get -yq install mono-vbnc dos2unix
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
 
       # Setup .NET
     - name: Setup .NET 10.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.x'
     - name: Setup .NET 9.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '9.0.x'
     - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '8.0.x'
 
@@ -49,7 +49,7 @@ jobs:
       run: pwsh make.ps1 package
 
       # Upload package
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: packages-${{ matrix.os }}
         path: Package/Release/Packages
@@ -65,21 +65,21 @@ jobs:
 
     steps:
       # Prerequisites
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
 
       # Setup .NET
     - name: Setup .NET 10.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.x'
     - name: Setup .NET 9.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '9.0.x'
     - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '8.0.x'
 

IronPython.slnx

@@ -13,10 +13,8 @@
     <File Path="Build.proj" />
     <File Path="CurrentVersion.props" />
     <File Path="Directory.Build.props" />
-    <File Path="IronPython.ruleset" />
     <File Path="LICENSE" />
     <File Path="make.ps1" />
-    <File Path="NuGet.config" />
     <File Path="README.md" />
   </Folder>
   <Folder Name="/Solution Items/Build/">

eng/scripts/CompareDirs.py

@@ -21,14 +21,14 @@ def compare_dirs(dir1, dir2):
 
 def main():
     if len(sys.argv)!=3:
-        print 'Usage: CompareDirs <dir1> <dir2>'
+        print('Usage: CompareDirs <dir1> <dir2>')
         sys.exit(-1)
 
     if compare_dirs(sys.argv[1],sys.argv[2]):
-        print "The directories are identical"
+        print("The directories are identical")
         sys.exit(0)
     else: #the part that differed is explained via dircmp.report() above
-        print "The directories differ"
+        print("The directories differ")
         sys.exit(1)
 
 if __name__=="__main__":

eng/scripts/clean.py

@@ -17,7 +17,7 @@ def do_dir(dirname):
         if os.path.isdir(filename):
             do_dir(filename)
         elif is_binary(filename):
-            print 'deleting', filename
+            print('deleting', filename)
             os.remove(filename)
 
 TOP_DIR = "c:\\IronPython-0.7"

eng/scripts/copyrights.py

@@ -51,18 +51,18 @@
 def add_header(filename, old_header, new_header):
     text = open(filename, 'r').read()
     if text.startswith(old_header):
-        print "replacing header", filename
+        print("replacing header", filename)
         text = new_header + text[len(old_header):]
         open(filename, 'w').write(text)
     elif not text.startswith(new_header):
-        print 'no old header', filename
+        print('no old header', filename)
         text = new_header + "\n" + text
         open(filename, 'w').write(text)
 
 def do_dir(dirname):
     import os
     for file in os.listdir(dirname):
-        print "Processing:", file
+        print("Processing:", file)
         if file == "ExternalCode": continue
         filename = os.path.join(dirname, file)
         if os.path.isdir(filename):

eng/scripts/generate_casts.py

@@ -82,7 +82,7 @@ def mark_cls_compliance(cw, t):
 def generate_type_cast(cw, t):
     mark_cls_compliance(cw, t)
     cw.enter_block("public static %(type)s ExplicitCastTo%(type)s(object o)", type = t)
-    cw.enter_block("if (o != null)")
+    cw.enter_block("if (o is not null)")
     cw.write("Type type = o.GetType();");
 
     cond = cw.conditions()
@@ -112,7 +112,7 @@ def generate_type_cast(cw, t):
 def generate_nullable_type_cast(cw, t):
     mark_cls_compliance(cw, t)
     cw.enter_block("public static Nullable<%(type)s> ExplicitCastToNullable%(type)s(object o)", type = t)
-    cw.enter_block("if (o == null)")
+    cw.enter_block("if (o is null)")
     cw.write("return new Nullable<%(type)s>();", type = t);
     cw.exit_block()
     cw.write("Type type = o.GetType();");

eng/scripts/generate_comdispatch.py

@@ -187,7 +187,7 @@ def gen_exposed_code_security(cw):
                 "return null;"
         ],
         setStatements=[
-                "if (value != null) {",
+                "if (value is not null) {",
                 "    Marshal.GetNativeVariantForObject(value, UnsafeMethods.ConvertVariantByrefToPtr(ref this));",
                 "}"
         ],
@@ -202,7 +202,7 @@ def gen_exposed_code_security(cw):
                 "return null;"
         ],
         setStatements=[
-                "if (value != null) {",
+                "if (value is not null) {",
                 "    _typeUnion._unionTypes._unknown = Marshal.GetIUnknownForObject(value);",
                 "}"
         ],
@@ -217,7 +217,7 @@ def gen_exposed_code_security(cw):
                 "return null;"
         ],
         setStatements=[
-                "if (value != null) {",
+                "if (value is not null) {",
                 "    _typeUnion._unionTypes._unknown = GetIDispatchForObject(value);",
                 "}"
         ],

eng/scripts/generate_dynamic_instructions.py

@@ -41,7 +41,7 @@ def gen_instruction(cw, n):
     func_type_params = ','.join(['CallSite'] + type_names + ['TRet'])
     func_type = 'Func<%s>' % func_type_params
 
-    cw.enter_block('internal class DynamicInstruction<%s> : Instruction' % class_type_params)
+    cw.enter_block('internal sealed class DynamicInstruction<%s> : Instruction' % class_type_params)
     cw.write('private CallSite<%s> _site;' % func_type)
     cw.write('')    
     cw.enter_block('public static Instruction Factory(CallSiteBinder binder)')
@@ -116,7 +116,7 @@ def gen_run_method(cw, n, is_void):
                                                 types, 
                                                 ','.join(param_names)))
 
-    cw.enter_block('if (_compiled != null || TryGetCompiled())')
+    cw.enter_block('if (_compiled is not null || TryGetCompiled())')
     args = ', '.join(['arg%d' % i for i in range(n)])
     if is_void:
         cw.write('((Action%s)_compiled)(%s);' % (types, args))

eng/scripts/generate_exceptions.py

@@ -85,6 +85,7 @@ def MakeNewException(self):
         ExceptionInfo('Exception', 'IronPython.Runtime.Exceptions.PythonException', None, (), (
                 ExceptionInfo('StopIteration', 'IronPython.Runtime.Exceptions.StopIterationException', None, ('value',), ()),
                 ExceptionInfo('StopAsyncIteration', 'IronPython.Runtime.Exceptions.StopAsyncIterationException', None, ('value',), ()),
+                ExceptionInfo('CancelledError', 'System.OperationCanceledException', None, (), ()),
                 ExceptionInfo('ArithmeticError', 'System.ArithmeticException', None, (), (
                         ExceptionInfo('FloatingPointError', 'IronPython.Runtime.Exceptions.FloatingPointException', None, (), ()),
                         ExceptionInfo('OverflowError', 'System.OverflowException', None, (), ()),
@@ -261,16 +262,26 @@ def gen_topython_helper(cw):
     cw.exit_block()
 
 
+_clr_name_overrides = {
+    'CancelledError': 'OperationCanceledException',
+}
+
 def get_clr_name(e):
+    if e in _clr_name_overrides:
+        return _clr_name_overrides[e]
     return e.replace('Error', '') + 'Exception'
 
 FACTORY = """
 internal static Exception %(name)s(string message) => new %(clrname)s(message);
 public static Exception %(name)s(string format, params object?[] args) => new %(clrname)s(string.Format(format, args));
 """.rstrip()
 
+# Exceptions that map to existing CLR types (no generated CLR class needed),
+# but still need factory methods in PythonOps.
+_factory_only_exceptions = ['CancelledError']
+
 def factory_gen(cw):
-    for e in pythonExcs:
+    for e in pythonExcs + _factory_only_exceptions:
         cw.write(FACTORY, name=e, clrname=get_clr_name(e))
 
 CLASS1 = """\

eng/scripts/generate_ops.py

@@ -10,7 +10,7 @@
 kwlist = [
     'and', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif', 'else', 'except',
     'finally', 'for', 'from', 'global', 'if', 'import', 'in', 'is', 'lambda', 'not', 'or', 'pass',
-    'raise', 'return', 'try', 'while', 'yield', 'as', 'with', 'async', 'nonlocal'
+    'raise', 'return', 'try', 'while', 'yield', 'as', 'with', 'async', 'nonlocal', 'await'
 ]
 
 class Symbol: