Mercurial > public > mercurial-scm > hg
comparison mercurial/utils/procutil.py @ 43106:d783f945a701
py3: finish porting iteritems() to pycompat and remove source transformer
This commit finishes porting .iteritems() to pycompat.iteritems()
for the mercurial package.
The translation of .iteritems() to .items() was the last conversion
performed by the source transformer. With the porting to pycompat
complete, we no longer have a need for the source transformer. So
the source transformer has been removed. Good riddance! The code
base is now compatible with Python 2 and Python 3.
For the record, as the person who introduced the source transformer,
it brings me joy to delete it. It accomplished its goal to facilitate
a port to Python 3 without overly burdening people on some painful
low-level differences between Python 2 and 3. It is unfortunate we
still have to wallpaper over many differences with the pycompat
shim. But it is what it is.
Differential Revision: https://phab.mercurial-scm.org/D7015
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 07 Oct 2019 00:04:04 -0400 |
| parents | 813aa8cc55d4 |
| children | 4aa72cdf616f |
comparison
equal
deleted
inserted
replaced
| 43105:649d3ac37a12 | 43106:d783f945a701 |
|---|---|
| 244 } | 244 } |
| 245 | 245 |
| 246 | 246 |
| 247 def filter(s, cmd): | 247 def filter(s, cmd): |
| 248 b"filter a string through a command that transforms its input to its output" | 248 b"filter a string through a command that transforms its input to its output" |
| 249 for name, fn in _filtertable.iteritems(): | 249 for name, fn in pycompat.iteritems(_filtertable): |
| 250 if cmd.startswith(name): | 250 if cmd.startswith(name): |
| 251 return fn(s, cmd[len(name) :].lstrip()) | 251 return fn(s, cmd[len(name) :].lstrip()) |
| 252 return pipefilter(s, cmd) | 252 return pipefilter(s, cmd) |
| 253 | 253 |
| 254 | 254 |
| 366 return b'1' | 366 return b'1' |
| 367 return pycompat.bytestr(val) | 367 return pycompat.bytestr(val) |
| 368 | 368 |
| 369 env = dict(encoding.environ) | 369 env = dict(encoding.environ) |
| 370 if environ: | 370 if environ: |
| 371 env.update((k, py2shell(v)) for k, v in environ.iteritems()) | 371 env.update((k, py2shell(v)) for k, v in pycompat.iteritems(environ)) |
| 372 env[b'HG'] = hgexecutable() | 372 env[b'HG'] = hgexecutable() |
| 373 return env | 373 return env |
| 374 | 374 |
| 375 | 375 |
| 376 if pycompat.iswindows: | 376 if pycompat.iswindows: |