equal
deleted
inserted
replaced
1263 |
1263 |
1264 if pycompat.ispypy: |
1264 if pycompat.ispypy: |
1265 # __setitem__() isn't called as of PyPy 5.8.0 |
1265 # __setitem__() isn't called as of PyPy 5.8.0 |
1266 def update(self, src): |
1266 def update(self, src): |
1267 if isinstance(src, dict): |
1267 if isinstance(src, dict): |
1268 src = src.iteritems() |
1268 src = pycompat.iteritems(src) |
1269 for k, v in src: |
1269 for k, v in src: |
1270 self[k] = v |
1270 self[k] = v |
1271 |
1271 |
1272 |
1272 |
1273 class cowdict(cow, dict): |
1273 class cowdict(cow, dict): |
3499 |
3499 |
3500 def __init__(self, map, skip=None): |
3500 def __init__(self, map, skip=None): |
3501 self._dirs = {} |
3501 self._dirs = {} |
3502 addpath = self.addpath |
3502 addpath = self.addpath |
3503 if isinstance(map, dict) and skip is not None: |
3503 if isinstance(map, dict) and skip is not None: |
3504 for f, s in map.iteritems(): |
3504 for f, s in pycompat.iteritems(map): |
3505 if s[0] != skip: |
3505 if s[0] != skip: |
3506 addpath(f) |
3506 addpath(f) |
3507 elif skip is not None: |
3507 elif skip is not None: |
3508 raise error.ProgrammingError( |
3508 raise error.ProgrammingError( |
3509 b"skip character is only supported " b"with a dict source" |
3509 b"skip character is only supported " b"with a dict source" |