comparison mercurial/encoding.py @ 33839:7d5bc0e5b88f

py3: introduce a wrapper for __builtins__.{raw_,}input()

In order to make this work, we have to wrap the io streams in a
TextIOWrapper so that __builtins__.input() can do unicode IO on Python
3. We can't just restore the original (unicode) sys.std* because we
might be running a cmdserver, and if we blindly restore sys.* to the
original values then we end up breaking the cmdserver. Sadly,
TextIOWrapper tries to close the underlying stream during its __del__,
so we have to make a sublcass to prevent that.

If you see errors like:

TypeError: a bytes-like object is required, not 'str'

On an input() or print() call on Python 3, the substitution of
sys.std* is probably the root cause.

A previous version of this change tried to put the bytesinput() method
in pycompat - it turns out we need to do some encoding handling, so we
have to be in a higher layer that's allowed to use
mercurial.encoding.encoding. As a result, this is in util for now,
with the TextIOWrapper subclass hiding in encoding.py. I'm not sure of
a better place for the time being.

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

33838:48f3e87ce650

# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import array
import locale
import os
import unicodedata

from . import (

        # unescape U+DCxx characters
        if "\xed\xb0\x80" <= c <= "\xed\xb3\xbf":
            c = chr(ord(c.decode("utf-8")) & 0xff)
        r += c
    return r

33839:7d5bc0e5b88f

# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import array
import io
import locale
import os
import unicodedata

from . import (

        # unescape U+DCxx characters
        if "\xed\xb0\x80" <= c <= "\xed\xb3\xbf":
            c = chr(ord(c.decode("utf-8")) & 0xff)
        r += c
    return r

class strio(io.TextIOWrapper):
    """Wrapper around TextIOWrapper that respects hg's encoding assumptions.

    Also works around Python closing streams.
    """

    def __init__(self, buffer, **kwargs):
        kwargs[r'encoding'] = _sysstr(encoding)
        super(strio, self).__init__(buffer, **kwargs)

    def __del__(self):
        """Override __del__ so it doesn't close the underlying stream."""