gh-94773: deepfreeze: support frozensets with unsortable types (GH-94775)

tiran · web-flow · commit 0c66074e9f8c · 2022-07-12T18:09:47.000+02:00
diff --git a/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
@@ -0,0 +1,2 @@
+``deepfreeze.py`` now supports code object with frozensets that contain
+incompatible, unsortable types.
diff --git a/Tools/scripts/deepfreeze.py b/Tools/scripts/deepfreeze.py
@@ -359,7 +359,12 @@ def generate_complex(self, name: str, z: complex) -> str:
         return f"&{name}.ob_base"
 
     def generate_frozenset(self, name: str, fs: FrozenSet[object]) -> str:
-        ret = self.generate_tuple(name, tuple(sorted(fs)))
+        try:
+            fs = sorted(fs)
+        except TypeError:
+            # frozen set with incompatible types, fallback to repr()
+            fs = sorted(fs, key=repr)
+        ret = self.generate_tuple(name, tuple(fs))
         self.write("// TODO: The above tuple should be a frozenset")
         return ret
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+``deepfreeze.py`` now supports code object with frozensets that contain
	`2`	`+incompatible, unsortable types.`