Merge branch 'python:master' into fix_list_comprehension

Author: randolf-scholz

mypy/semanal.py

@@ -1059,7 +1059,7 @@ def remove_unpack_kwargs(self, defn: FuncDef, typ: CallableType) -> CallableType
         # It is OK for TypedDict to have a key named 'kwargs'.
         overlap.discard(typ.arg_names[-1])
         if overlap:
-            overlapped = ", ".join([f'"{name}"' for name in overlap])
+            overlapped = ", ".join([f'"{name}"' for name in sorted(filter(None, overlap))])
             self.fail(f"Overlap between argument names and ** TypedDict items: {overlapped}", defn)
             new_arg_types = typ.arg_types[:-1] + [AnyType(TypeOfAny.from_error)]
             return typ.copy_modified(arg_types=new_arg_types)

mypyc/test/test_cheader.py

@@ -7,7 +7,6 @@
 import re
 import unittest
 
-from mypyc.ir.ops import PrimitiveDescription
 from mypyc.primitives import registry
 
 
@@ -32,8 +31,6 @@ def check_name(name: str) -> None:
             registry.function_ops.values(),
         ]:
             for ops in values:
-                if isinstance(ops, PrimitiveDescription):
-                    ops = [ops]
                 for op in ops:
                     if op.c_function_name is not None:
                         check_name(op.c_function_name)