Mercurial > hg
comparison mercurial/pycompat.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 | 649d3ac37a12 |
children | 8ff1ecfadcd1 |
comparison
equal
deleted
inserted
replaced
43105:649d3ac37a12 | 43106:d783f945a701 |
---|---|
314 """ | 314 """ |
315 Converts the keys of a python dictonary to str i.e. unicodes so that | 315 Converts the keys of a python dictonary to str i.e. unicodes so that |
316 they can be passed as keyword arguments as dictonaries with bytes keys | 316 they can be passed as keyword arguments as dictonaries with bytes keys |
317 can't be passed as keyword arguments to functions on Python 3. | 317 can't be passed as keyword arguments to functions on Python 3. |
318 """ | 318 """ |
319 dic = dict((k.decode('latin-1'), v) for k, v in dic.iteritems()) | 319 dic = dict((k.decode('latin-1'), v) for k, v in dic.items()) |
320 return dic | 320 return dic |
321 | 321 |
322 def byteskwargs(dic): | 322 def byteskwargs(dic): |
323 """ | 323 """ |
324 Converts keys of python dictonaries to bytes as they were converted to | 324 Converts keys of python dictonaries to bytes as they were converted to |
325 str to pass that dictonary as a keyword argument on Python 3. | 325 str to pass that dictonary as a keyword argument on Python 3. |
326 """ | 326 """ |
327 dic = dict((k.encode('latin-1'), v) for k, v in dic.iteritems()) | 327 dic = dict((k.encode('latin-1'), v) for k, v in dic.items()) |
328 return dic | 328 return dic |
329 | 329 |
330 # TODO: handle shlex.shlex(). | 330 # TODO: handle shlex.shlex(). |
331 def shlexsplit(s, comments=False, posix=True): | 331 def shlexsplit(s, comments=False, posix=True): |
332 """ | 332 """ |