[pypy-commit] pypy py3.6: merge default into py3.6, fix test

2019-05-06 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96573:5420cbd1f137 Date: 2019-05-06 22:18 -0400 http://bitbucket.org/pypy/pypy/changeset/5420cbd1f137/ Log:merge default into py3.6, fix test diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py --- a/pypy/module/_io/i

[pypy-commit] pypy default: fix for issue #3012, if no \r no need to translate

2019-05-06 Thread mattip
Author: Matti Picus Branch: Changeset: r96572:436eebe7adb1 Date: 2019-05-06 21:52 -0400 http://bitbucket.org/pypy/pypy/changeset/436eebe7adb1/ Log:fix for issue #3012, if no \r no need to translate diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py --- a/pypy/m