Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/pycompat.py @ 33624:524b13fc711f stable
util: fix sortdict.update() to call __setitem__() on PyPy (issue5639)
It appears that overriding __setitem__() doesn't work as documented on PyPy.
Let's patch it as before bd0fd3ff9916.
https://docs.python.org/2/library/collections.html#ordereddict-examples-and-recipes
The issue was ui.configitems() wasn't ordered correctly, so the pull command
was wrapped in different order.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 02 Aug 2017 22:51:19 +0900 |
parents | 6e38b4212661 |
children | cfcfbe6c96f8 |
comparison
equal
deleted
inserted
replaced
33623:6788e648efcf | 33624:524b13fc711f |
---|---|
14 import os | 14 import os |
15 import shlex | 15 import shlex |
16 import sys | 16 import sys |
17 | 17 |
18 ispy3 = (sys.version_info[0] >= 3) | 18 ispy3 = (sys.version_info[0] >= 3) |
19 ispypy = (r'__pypy__' in sys.builtin_module_names) | |
19 | 20 |
20 if not ispy3: | 21 if not ispy3: |
21 import cookielib | 22 import cookielib |
22 import cPickle as pickle | 23 import cPickle as pickle |
23 import httplib | 24 import httplib |