This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7380

encoding: define per-use identity functions only in typechecking mode
AbandonedPublic

Authored by durin42 on Nov 13 2019, 10:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This avoids some unfortunate overhead from my previous iteration.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Nov 13 2019, 10:51 PM
durin42 added a comment.Nov 13 2019, 11:02 PM

Let's not land this for now: it's breaking a fair amount of typechecking. :(

durin42 abandoned this revision.Nov 13 2019, 11:03 PM
dlax added a subscriber: dlax.Nov 14 2019, 5:50 AM

Have you tried using variables annotations? Like:

strtolocal = pycompat.identity  # type: (str) -> bytes
strfromlocal = pycompat.identity  # type: (bytes) -> str
yuja added a subscriber: yuja.Nov 14 2019, 9:31 AM
strtolocal = pycompat.identity  # type: (str) -> bytes
strfromlocal = pycompat.identity  # type: (bytes) -> str

# type: Callable[[str], bytes] might work. pytype complained
# type: ... -> ... is an invalid type comment.

Revision Contents
Changeset List

PathPackages
Mmercurial/encoding.py (21 lines)

Diff 18065

mercurial/encoding.py

from .pure import charencode as charencodepure from .pure import charencode as charencodepure
if not globals(): # hide this from non-pytype users if not globals(): # hide this from non-pytype users
from typing import ( from typing import (
Any, Any,
Callable, Callable,
List, List,
TYPE_CHECKING,
Text, Text,
Type, Type,
TypeVar, TypeVar,
Union, Union,
) )
# keep pyflakes happy # keep pyflakes happy
for t in (Any, Callable, List, Text, Type, Union): for t in (Any, Callable, List, Text, Type, Union, TYPE_CHECKING):
assert t assert t
_Tlocalstr = TypeVar('_Tlocalstr', bound=localstr) _Tlocalstr = TypeVar('_Tlocalstr', bound=localstr)
charencode = policy.importmod('charencode') charencode = policy.importmod('charencode')
isasciistr = charencode.isasciistr isasciistr = charencode.isasciistr
asciilower = charencode.asciilower asciilower = charencode.asciilower
# 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
strmethod = pycompat.identity
if 'TYPE_CHECKING' in globals() and TYPE_CHECKING:
def strtolocal(s): def strtolocal(s):
# type: (str) -> bytes # type: (str) -> bytes
return s return s
def strfromlocal(s): def strfromlocal(s):
# type: (bytes) -> str # type: (bytes) -> str
return s return s
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('utf-8')), tolocal(v.encode('utf-8'))) (tolocal(k.encode('utf-8')), tolocal(v.encode('utf-8')))
for k, v in os.environ.items() # re-exports for k, v in os.environ.items() # re-exports
) )