Show More
@@ -16,6 +16,7 b' 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 |
@@ -584,6 +584,14 b' class sortdict(collections.OrderedDict):' | |||||
584 | del self[key] |
|
584 | del self[key] | |
585 | super(sortdict, self).__setitem__(key, value) |
|
585 | super(sortdict, self).__setitem__(key, value) | |
586 |
|
586 | |||
|
587 | if pycompat.ispypy: | |||
|
588 | # __setitem__() isn't called as of PyPy 5.8.0 | |||
|
589 | def update(self, src): | |||
|
590 | if isinstance(src, dict): | |||
|
591 | src = src.iteritems() | |||
|
592 | for k, v in src: | |||
|
593 | self[k] = v | |||
|
594 | ||||
587 | @contextlib.contextmanager |
|
595 | @contextlib.contextmanager | |
588 | def acceptintervention(tr=None): |
|
596 | def acceptintervention(tr=None): | |
589 | """A context manager that closes the transaction on InterventionRequired |
|
597 | """A context manager that closes the transaction on InterventionRequired |
General Comments 0
You need to be logged in to leave comments.
Login now