[pypy-commit] pypy py3.6: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r98232:5a724d59f277
Date: 2019-12-04 18:11 +0200
http://bitbucket.org/pypy/pypy/changeset/5a724d59f277/

Log:	merge default into branch

diff --git a/pypy/test_all.py b/pypy/test_all.py
--- a/pypy/test_all.py
+++ b/pypy/test_all.py
@@ -28,7 +28,7 @@
     # Always remove the cached files
     # Before translation this is done via "py.path.local(CACHE_DIR).remove()"
     print 'removing %s/rpython/_cache' % toplevel
-    shutil.rmtree('%s/rpython/_cache', ignore_errors=True)
+    shutil.rmtree('%s/rpython/_cache' % toplevel, ignore_errors=True)
     # Add toplevel repository dir to sys.path
     sys.path.insert(0, toplevel)
     import pytest
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -800,7 +800,7 @@
         DIRENT = rffi_platform.Struct('struct dirent',
             [('d_name', lltype.FixedSizeArray(rffi.CHAR, 1)),
              ('d_ino', lltype.Signed)]
-            + [('d_type', rffi.INT)] if HAVE_D_TYPE else [])
+            + ([('d_type', rffi.INT)] if HAVE_D_TYPE else []))
         if HAVE_D_TYPE:
             DT_UNKNOWN = rffi_platform.ConstantInteger('DT_UNKNOWN')
             DT_REG     = rffi_platform.ConstantInteger('DT_REG')