diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-07-12 16:35:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-12 16:35:43 (GMT) |
| commit | cdd0cabf92e731518ab1ff842673a4578213c1b5 (patch) | |
| tree | 0865861f59baa908cbc14b287fc9a267f8a27316 | |
| parent | a4b98a792f67fcb71c41dde215b48e6a7ee5fa3a (diff) | |
| download | cpython-cdd0cabf92e731518ab1ff842673a4578213c1b5.zip cpython-cdd0cabf92e731518ab1ff842673a4578213c1b5.tar.gz cpython-cdd0cabf92e731518ab1ff842673a4578213c1b5.tar.bz2 | |
gh-94773: deepfreeze: support frozensets with unsortable types (GH-94775)
(cherry picked from commit 0c66074e9f8c9728e1d920910d35da0c62f30403)
Co-authored-by: Christian Heimes <christian@python.org>
| -rw-r--r-- | Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst | 2 | ||||
| -rw-r--r-- | Tools/scripts/deepfreeze.py | 7 |
2 files changed, 8 insertions, 1 deletions
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 new file mode 100644 index 0000000..ed7e40c --- /dev/null +++ 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 index 5a64c1e..c300c30 100644 --- a/Tools/scripts/deepfreeze.py +++ b/Tools/scripts/deepfreeze.py @@ -369,7 +369,12 @@ class Printer: 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 |