comparison mercurial/ui.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 74802979dd9d
children 57efd5bd2ca2
comparison
equal deleted inserted replaced
43105:649d3ac37a12 43106:d783f945a701
2218 suboptions = suboptions or {} 2218 suboptions = suboptions or {}
2219 2219
2220 # Now process the sub-options. If a sub-option is registered, its 2220 # Now process the sub-options. If a sub-option is registered, its
2221 # attribute will always be present. The value will be None if there 2221 # attribute will always be present. The value will be None if there
2222 # was no valid sub-option. 2222 # was no valid sub-option.
2223 for suboption, (attr, func) in _pathsuboptions.iteritems(): 2223 for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
2224 if suboption not in suboptions: 2224 if suboption not in suboptions:
2225 setattr(self, attr, None) 2225 setattr(self, attr, None)
2226 continue 2226 continue
2227 2227
2228 value = func(ui, self, suboptions[suboption]) 2228 value = func(ui, self, suboptions[suboption])
2244 """Return sub-options and their values for this path. 2244 """Return sub-options and their values for this path.
2245 2245
2246 This is intended to be used for presentation purposes. 2246 This is intended to be used for presentation purposes.
2247 """ 2247 """
2248 d = {} 2248 d = {}
2249 for subopt, (attr, _func) in _pathsuboptions.iteritems(): 2249 for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
2250 value = getattr(self, attr) 2250 value = getattr(self, attr)
2251 if value is not None: 2251 if value is not None:
2252 d[subopt] = value 2252 d[subopt] = value
2253 return d 2253 return d
2254 2254