tests: fix doctest stability over Python versions

pprint ain't pretty in Python 2.4:
Changed in version 2.5: Dictionaries are sorted by key before the display is
computed; before 2.5, a dictionary was sorted only if its display required more
than one line, although that wasn’t documented.

Fixes issue introduced in 404feac78b8a.

mercurial/changelog.py

@@ -27,12 +27,13 def _string_escape(text):
 
 def decodeextra(text):
     """
-    >>> from pprint import pprint as pp
-    >>> pp(decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'})))
-    {'baz': '\\x002', 'branch': 'default', 'foo': 'bar'}
-    >>> pp(decodeextra(encodeextra({'foo': 'bar',
-    ...                             'baz': chr(92) + chr(0) + '2'})))
-    {'baz': '\\\\\\x002', 'branch': 'default', 'foo': 'bar'}
+    >>> sorted(decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'})
+    ...                    ).iteritems())
+    [('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
+    >>> sorted(decodeextra(encodeextra({'foo': 'bar',
+    ...                                 'baz': chr(92) + chr(0) + '2'})
+    ...                    ).iteritems())
+    [('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
     """
     extra = _defaultextra.copy()
     for l in text.split('\0'):