Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r87324:b15a35fba9da
Date: 2016-09-22 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/b15a35fba9da/

Log:    hg merge py3k

diff --git a/lib_pypy/grp.py b/lib_pypy/grp.py
--- a/lib_pypy/grp.py
+++ b/lib_pypy/grp.py
@@ -23,7 +23,7 @@
     i = 0
     members = []
     while res.gr_mem[i]:
-        members.append(ffi.string(res.gr_mem[i]))
+        members.append(os.fsdecode(ffi.string(res.gr_mem[i])))
         i += 1
     return struct_group([
         os.fsdecode(ffi.string(res.gr_name)),
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -5,7 +5,8 @@
     # some tests fail otherwise
     sys.setrecursionlimit(2000)
 
-PYTHON3 = os.getenv('PYTHON3') or py.path.local.sysfind('python3')
+LOOK_FOR_PYTHON3 = 'python3.5'
+PYTHON3 = os.getenv('PYTHON3') or py.path.local.sysfind(LOOK_FOR_PYTHON3)
 if PYTHON3 is not None:
     PYTHON3 = str(PYTHON3)
 
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,6 +5,12 @@
 .. this is a revision shortly after release-pypy2.7-v5.4
 .. startrev: 522736f816dc
 
+.. branch: mappingproxy
+.. branch: py3k-finish_time
+.. branch: py3k-kwonly-builtin
+.. branch: py3k_add_terminal_size
+.. branch: testing-cleanup-py3k
+
 .. branch: rpython-resync
 Backport rpython changes made directly on the py3k and py3.5 branches.
 
diff --git a/pypy/interpreter/test/test_app_main.py 
b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -7,7 +7,7 @@
 from rpython.tool.udir import udir
 from contextlib import contextmanager
 from pypy import pypydir
-from pypy.conftest import PYTHON3
+from pypy.conftest import PYTHON3, LOOK_FOR_PYTHON3
 from pypy.interpreter.test.conftest import banner
 from lib_pypy._pypy_interact import irc_header
 
@@ -18,8 +18,8 @@
     if PYTHON3:
         return PYTHON3
     import py.test
-    py.test.fail("Test requires 'python3' (not found in PATH) or a PYTHON3 "
-                 "environment variable set")
+    py.test.fail("Test requires %r (not found in PATH) or a PYTHON3 "
+                 "environment variable set" % (LOOK_FOR_PYTHON3,))
 
 _counter = 0
 def _get_next_path(ext='.py'):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to