PyPy has changes that are not present here

[mattip]

For instance, in simple_interact.py there is _strip_final_indent, which is not present here.

def _strip_final_indent(text):
    # kill spaces and tabs at the end, but only if they follow '\n'.
    # meant to remove the auto-indentation only (although it would of
    # course also remove explicitly-added indentation).
    short = text.rstrip(' \t')
    n = len(short)
    if n > 0 and text[n-1] == '\n':
        return short
    return text

def run_multiline_interactive_console(mainmodule=None, future_flags=0):
    import code
    import __main__
    mainmodule = mainmodule or __main__
    console = code.InteractiveConsole(mainmodule.__dict__, filename='<stdin>')
    if future_flags:
        console.compile.compiler.flags |= future_flags

    def more_lines(unicodetext):
        # ooh, look at the hack:
        if sys.version_info < (3,):
            src = "#coding:utf-8\n"+_strip_final_indent(unicodetext).encode('utf-8')
        else:
            src = _strip_final_indent(unicodetext)
        try:
            code = console.compile(src, '<stdin>', 'single')
        except (OverflowError, SyntaxError, ValueError):
            return False
        else:
            return code is None

...

[obfusk]

There was also this PyPy commit, which fixes handling escape sequences in prompts.

[obfusk]

Looking though this and this it seems the codebases were kept somewhat in sync in the past but completely diverged around Apr 14, 2013.

[blueyed]

See also #2.

[blueyed]

@mattip
I've just seen https://foss.heptapod.net/pypy/pypy/-/commit/1730e6f455196fc719103033d518d648153bac52: "revert pyrepl to 8ef001285964, before merging upstream".
Not sure what the commit references, since the link goes to https://foss.heptapod.net/pypy/pypy/-/commit/92d6cfaba23a8d8765ece99930afdb899ed1e9d1 (only 3 weeks old).
Looks like this might be related to this issue.. are you trying to merge the two branches/trunks?

[mattip]

I tried to

• merge this repo back to PyPy, including PRs that have not yet been merged
• unify pyrepl in the default (python2.7) and py3.7 PyPy branches.

I failed, and so reverted the work from the branches above. So as to not lose what I had done, I created the pyrepl and pyrepl3 branches.