Merge remote-tracking branch 'upstream/master' into zope4py2

component/ZODB/test-zodb4-wc2.cfg

@@ -23,6 +23,8 @@ parts =
 major = 4-wc2
 [ZODB4-wc2-repository]
 revision =
+[python]
+part = python2.7
 
 # we need persistent to be a git checkout because persistent tests want to
 # discover in-tree files that are not present in persistent egg when it is
@@ -76,7 +78,9 @@ inline =
         from os.path import dirname
         for m in "ZODB", "persistent", "BTrees", "transaction", "ZEO":
             print(dirname(__import__(m).__file__))
-  """])
+  """],
+    universal_newlines=True,
+  )
   ZODB, persistent, BTrees, transaction, ZEO = where.split()
 
   # run tests for whole ZODB stack