This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7267

encoding: define local identify functions with explicit type comments
ClosedPublic

Authored by durin42 on Nov 6 2019, 5:56 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5f2a8dabb0d8: encoding: define local identify functions with explicit type comments
Summary

This removes some obfuscation as far as pytype is concerned and
corrects many bogus type errors.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Nov 6 2019, 5:56 PM
indygreg accepted this revision.Nov 7 2019, 3:06 AM
This revision is now accepted and ready to land.Nov 7 2019, 3:06 AM
yuja added a subscriber: yuja.Nov 8 2019, 9:10 AM
  • a/mercurial/encoding.py

+++ b/mercurial/encoding.py
@@ -241,8 +241,15 @@

strfromlocal = unifromlocal
strmethod = unimethod

else:

  • strtolocal = pycompat.identity
  • strfromlocal = pycompat.identity

+
+ def strtolocal(s):
+ # type: (str) -> bytes
+ return s
+
+ def strfromlocal(s):
+ # type: (bytes) -> str
+ return s

It disables the fast path f is identity in pycompat.rapply. I don't
think that matters, but I just noted.

Revision Contents
Changeset List

PathPackages
Mmercurial/encoding.py (11 lines)

Diff 17637

mercurial/encoding.py

# converter functions between native str and byte string. use these if the # converter functions between native str and byte string. use these if the
# character encoding is not aware (e.g. exception message) or is known to # character encoding is not aware (e.g. exception message) or is known to
# be locale dependent (e.g. date formatting.) # be locale dependent (e.g. date formatting.)
if pycompat.ispy3: if pycompat.ispy3:
strtolocal = unitolocal strtolocal = unitolocal
strfromlocal = unifromlocal strfromlocal = unifromlocal
strmethod = unimethod strmethod = unimethod
else: else:
strtolocal = pycompat.identity
strfromlocal = pycompat.identity def strtolocal(s):
# type: (str) -> bytes
return s
def strfromlocal(s):
# type: (bytes) -> str
return s
strmethod = pycompat.identity strmethod = pycompat.identity
if not _nativeenviron: if not _nativeenviron:
# now encoding and helper functions are available, recreate the environ # now encoding and helper functions are available, recreate the environ
# dict to be exported to other modules # dict to be exported to other modules
environ = dict( environ = dict(
(tolocal(k.encode(r'utf-8')), tolocal(v.encode(r'utf-8'))) (tolocal(k.encode(r'utf-8')), tolocal(v.encode(r'utf-8')))
for k, v in os.environ.items() # re-exports for k, v in os.environ.items() # re-exports