Mercurial > public > mercurial-scm > hg-stable
comparison hgext/githelp.py @ 49004:f254fc73d956
global: bulk replace simple pycompat.iteritems(x) with x.items()
pycompat.iteritems() just calls .items().
This commit applies a regular expression search and replace to convert
simple instances of pycompat.iteritems() with .items(). There are still
a handful of calls to pycompat.iteritems() remaining. But these all have
more complicated expressions that I wasn't comfortable performing an
automated replace on. In addition, some simple replacements were withheld
because they broke pytype. These will be handled by their own changesets.
Differential Revision: https://phab.mercurial-scm.org/D12318
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 03 Mar 2022 18:28:30 -0800 |
| parents | 6000f5b25c9b |
| children | 642e31cb55f0 |
comparison
equal
deleted
inserted
replaced
| 49003:a0674e916fb6 | 49004:f254fc73d956 |
|---|---|
| 113 | 113 |
| 114 args = list([convert(x) for x in args]) | 114 args = list([convert(x) for x in args]) |
| 115 opts = dict( | 115 opts = dict( |
| 116 [ | 116 [ |
| 117 (k, convert(v)) if isinstance(v, bytes) else (k, v) | 117 (k, convert(v)) if isinstance(v, bytes) else (k, v) |
| 118 for k, v in pycompat.iteritems(opts) | 118 for k, v in opts.items() |
| 119 ] | 119 ] |
| 120 ) | 120 ) |
| 121 | 121 |
| 122 return args, opts | 122 return args, opts |
| 123 | 123 |
| 129 self.opts = {} | 129 self.opts = {} |
| 130 | 130 |
| 131 def __bytes__(self): | 131 def __bytes__(self): |
| 132 cmd = b"hg " + self.name | 132 cmd = b"hg " + self.name |
| 133 if self.opts: | 133 if self.opts: |
| 134 for k, values in sorted(pycompat.iteritems(self.opts)): | 134 for k, values in sorted(self.opts.items()): |
| 135 for v in values: | 135 for v in values: |
| 136 if v: | 136 if v: |
| 137 if isinstance(v, int): | 137 if isinstance(v, int): |
| 138 fmt = b' %s %d' | 138 fmt = b' %s %d' |
| 139 else: | 139 else: |