Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r87825:b9b2d465ee79
Date: 2016-10-16 10:13 +0200
http://bitbucket.org/pypy/pypy/changeset/b9b2d465ee79/
Log: Minimize the diff to default
diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -1358,6 +1358,7 @@
if size == 0:
return STR('')
+
pos = 0
while pos < size:
ch = s[pos]
diff --git a/rpython/tool/runsubprocess.py b/rpython/tool/runsubprocess.py
--- a/rpython/tool/runsubprocess.py
+++ b/rpython/tool/runsubprocess.py
@@ -6,7 +6,6 @@
import sys
import gc
import os
-from io import TextIOWrapper
from subprocess import PIPE, Popen
PY2 = (sys.version_info.major == 2)
@@ -87,6 +86,7 @@
else:
# create TextIOWrappers which (hopefully) have the same newline
# behavior as the child's stdin / stdout
+ from io import TextIOWrapper
child_stdin = TextIOWrapper(_child.stdin,
newline=sys.stdin.newlines,
write_through=True)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
