comparison mercurial/encoding.py @ 43506:9f70512ae2cf

cleanup: remove pointless r-prefixes on single-quoted strings

This is the promised second step on single-quoted strings. These had
existed because our source transformer didn't turn r'' into b'', so we
had tagged some strings as r-strings to get "native" strings on both
Pythons. Now that the transformer is gone, we can dispense with this
nonsense.

Methodology:

I ran

    hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$'  | xargs egrep --color=never -n  -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\

in an emacs grep-mode buffer, and then used a keyboard macro to
iterate over the results and remove the r prefix as needed.

# skip-blame removing unneeded r prefixes left over from Python 3 migration.

Differential Revision: https://phab.mercurial-scm.org/D7306

43505:47fac1692ede

    for t in (Any, Callable, List, Text, Type, Union):
        assert t

    _Tlocalstr = TypeVar('_Tlocalstr', bound=localstr)

charencode = policy.importmod(r'charencode')

isasciistr = charencode.isasciistr
asciilower = charencode.asciilower
asciiupper = charencode.asciiupper
_jsonescapeu8fast = charencode.jsonescapeu8fast

    environ = os.environb  # re-exports
else:
    # preferred encoding isn't known yet; use utf-8 to avoid unicode error
    # and recreate it once encoding is settled
    environ = dict(
        (k.encode(r'utf-8'), v.encode(r'utf-8'))
        for k, v in os.environ.items()  # re-exports
    )

_encodingrewrites = {
    b'646': b'ascii',

if not _nativeenviron:
    # now encoding and helper functions are available, recreate the environ
    # dict to be exported to other modules
    environ = dict(
        (tolocal(k.encode(r'utf-8')), tolocal(v.encode(r'utf-8')))
        for k, v in os.environ.items()  # re-exports
    )

if pycompat.ispy3:
    # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which

def colwidth(s):
    # type: (bytes) -> int
    b"Find the column width of a string for display in the local encoding"
    return ucolwidth(s.decode(_sysstr(encoding), r'replace'))


def ucolwidth(d):
    # type: (Text) -> int
    b"Find the column width of a Unicode string for display"

43506:9f70512ae2cf

    for t in (Any, Callable, List, Text, Type, Union):
        assert t

    _Tlocalstr = TypeVar('_Tlocalstr', bound=localstr)

charencode = policy.importmod('charencode')

isasciistr = charencode.isasciistr
asciilower = charencode.asciilower
asciiupper = charencode.asciiupper
_jsonescapeu8fast = charencode.jsonescapeu8fast

    environ = os.environb  # re-exports
else:
    # preferred encoding isn't known yet; use utf-8 to avoid unicode error
    # and recreate it once encoding is settled
    environ = dict(
        (k.encode('utf-8'), v.encode('utf-8'))
        for k, v in os.environ.items()  # re-exports
    )

_encodingrewrites = {
    b'646': b'ascii',

if not _nativeenviron:
    # now encoding and helper functions are available, recreate the environ
    # dict to be exported to other modules
    environ = dict(
        (tolocal(k.encode('utf-8')), tolocal(v.encode('utf-8')))
        for k, v in os.environ.items()  # re-exports
    )

if pycompat.ispy3:
    # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which

def colwidth(s):
    # type: (bytes) -> int
    b"Find the column width of a string for display in the local encoding"
    return ucolwidth(s.decode(_sysstr(encoding), 'replace'))


def ucolwidth(d):
    # type: (Text) -> int
    b"Find the column width of a Unicode string for display"