# HG changeset patch # User Mads Kiilerich # Date 2023-06-27 08:09:11 # Node ID a2df74853f8df331b530e71df4c36828167362ab # Parent faccec1edc2c44ed13d2c1af0ec8fe34c4dbd2b4 tests: fix sortdict doctest with Python 3.12 The output of OrderedDict changed to use plain dict syntax: $ python3.11 -c "import collections;print(collections.OrderedDict([('a', 0), ('b', 1)]))" OrderedDict([('a', 0), ('b', 1)]) $ python3.12 -c "import collections;print(collections.OrderedDict([('a', 0), ('b', 1)]))" OrderedDict({'a': 0, 'b': 1}) diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -1277,14 +1277,14 @@ class sortdict(collections.OrderedDict): >>> d1 = sortdict([(b'a', 0), (b'b', 1)]) >>> d2 = d1.copy() - >>> d2 - sortdict([('a', 0), ('b', 1)]) + >>> list(d2.items()) + [('a', 0), ('b', 1)] >>> d2.update([(b'a', 2)]) >>> list(d2.keys()) # should still be in last-set order ['b', 'a'] >>> d1.insert(1, b'a.5', 0.5) - >>> d1 - sortdict([('a', 0), ('a.5', 0.5), ('b', 1)]) + >>> list(d1.items()) + [('a', 0), ('a.5', 0.5), ('b', 1)] """ def __setitem__(self, key, value):