This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4743

encoding: remove unnecessary lambdas from _encodingfixers
ClosedPublic

Authored by martinvonz on Sep 25 2018, 8:03 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9e8fcd2e78c1: encoding: remove unnecessary lambdas from _encodingfixers
Summary

They have been unnecessary since 1a3a08b5d4d5 (encoding: remove
workaround for locale.getpreferredencoding(), 2017-05-13). Also rename
the variable since "fixer" sounds like a function.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 25 2018, 8:03 PM
Closed by commit rHG9e8fcd2e78c1: encoding: remove unnecessary lambdas from _encodingfixers (authored by martinvonz). · Explain WhySep 26 2018, 7:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/encoding.py (10 lines)

Diff 11371

mercurial/encoding.py

elif _nativeenviron: elif _nativeenviron:
environ = os.environb # re-exports environ = os.environb # re-exports
else: else:
# preferred encoding isn't known yet; use utf-8 to avoid unicode error # preferred encoding isn't known yet; use utf-8 to avoid unicode error
# and recreate it once encoding is settled # and recreate it once encoding is settled
environ = dict((k.encode(u'utf-8'), v.encode(u'utf-8')) environ = dict((k.encode(u'utf-8'), v.encode(u'utf-8'))
for k, v in os.environ.items()) # re-exports for k, v in os.environ.items()) # re-exports
_encodingfixers = { _encodingrewrites = {
'646': lambda: 'ascii', '646': 'ascii',
'ANSI_X3.4-1968': lambda: 'ascii', 'ANSI_X3.4-1968': 'ascii',
} }
# cp65001 is a Windows variant of utf-8, which isn't supported on Python 2. # cp65001 is a Windows variant of utf-8, which isn't supported on Python 2.
# No idea if it should be rewritten to the canonical name 'utf-8' on Python 3. # No idea if it should be rewritten to the canonical name 'utf-8' on Python 3.
# https://bugs.python.org/issue13216 # https://bugs.python.org/issue13216
if pycompat.iswindows and not pycompat.ispy3: if pycompat.iswindows and not pycompat.ispy3:
_encodingfixers['cp65001'] = lambda: 'utf-8' _encodingrewrites['cp65001'] = 'utf-8'
try: try:
encoding = environ.get("HGENCODING") encoding = environ.get("HGENCODING")
if not encoding: if not encoding:
encoding = locale.getpreferredencoding().encode('ascii') or 'ascii' encoding = locale.getpreferredencoding().encode('ascii') or 'ascii'
encoding = _encodingfixers.get(encoding, lambda: encoding)() encoding = _encodingrewrites.get(encoding, encoding)
except locale.Error: except locale.Error:
encoding = 'ascii' encoding = 'ascii'
encodingmode = environ.get("HGENCODINGMODE", "strict") encodingmode = environ.get("HGENCODINGMODE", "strict")
fallbackencoding = 'ISO-8859-1' fallbackencoding = 'ISO-8859-1'
class localstr(bytes): class localstr(bytes):
'''This class allows strings that are unmodified to be '''This class allows strings that are unmodified to be
round-tripped to the local encoding and back''' round-tripped to the local encoding and back'''