Fixing tests under python3

buildout.cfg

@@ -3,10 +3,12 @@
 #  http://download.zope.org/zopetoolkit/index/1.1/zopeapp-versions.cfg
 #  http://download.zope.org/zopetoolkit/index/1.1/ztk-versions.cfg
 develop = .
-    ../zope.testbrowser.svn
-    ../zope.app.appsetup
-    ../zope.app.publication
-    ../ZODB
+find-links =
+	${buildout:directory}/zope.app.appsetup-4.0.0a1.dev.tar.gz
+	${buildout:directory}/zope.app.publication-4.0.0a1.dev.tar.gz
+	${buildout:directory}/zope.testbrowser-4.0.3dev.tar.gz
+	${buildout:directory}/ZODB-4.0.0dev.tar.gz
+
 parts = test
 versions=versions
 
@@ -17,3 +19,9 @@ eggs = zope.app.wsgi [test]
 [versions]
 zope.i18n = 4.0.0a4
 zope.tal=4.0.0a1
+ZODB=4.0.0dev
+zope.app.appsetup=4.0.0a1.dev
+zope.app.publication=4.0.0a1.dev
+zope.testbrowser=4.0.3dev
+zope.securitypolicy= >=4.0.0a1
+zope.session = >=4.0.0a1

setup.py

@@ -67,7 +67,7 @@
           'zope.security>4.0.0a2',
           'zope.component',
           'zope.configuration',
-          'zope.container',
+          'zope.container >=4.0.0a1',
           'zope.error',
           'zope.lifecycleevent',
           'zope.session >= 4.0.0a1',

src/zope/app/wsgi/README.txt

@@ -145,7 +145,7 @@ example:
   >>> sitezcml = os.path.join(temp_dir, 'site.zcml')
   >>> written = open(sitezcml, 'w').write('<configure />')
 
-  >>> configFile = io.StringIO('''
+  >>> configFile = io.StringIO(u'''
   ... site-definition %s
   ...
   ... <zodb>

src/zope/app/wsgi/_compat.py

@@ -28,5 +28,5 @@
     _u = str
     import xmlrpc.client as xmlrpcclient
     import http.client as httpclient
-    from io import IOBase
-    FileType = IOBase
+    import io
+    FileType = io._io._IOBase

src/zope/app/wsgi/fileresult.txt

@@ -26,7 +26,7 @@ Lets look at an example with a regular file object:
     >>> request = TestRequest()
     >>> result = component.getMultiAdapter((ProxyFactory(f), request), IResult)
     >>> for line in result:
-    ...     print(line)
+    ...     print(line.decode('latin1'))
     One
     Two
     Three
@@ -39,11 +39,11 @@ Lets look at an example with a regular file object:
 We'll see something similar with a temporary file:
 
     >>> t = tempfile.TemporaryFile()
-    >>> t.write('Three\nTwo\nOne\nHa ha! I love to count down!\n')
+    >>> written = t.write(b'Three\nTwo\nOne\nHa ha! I love to count down!\n')
     >>> request = TestRequest()
     >>> result = component.getMultiAdapter((ProxyFactory(t), request), IResult)
     >>> for line in result:
-    ...     print line
+    ...     print(line.decode('latin1'))
     Three
     Two
     One