Python 3: io.StringIO

zopefoundation · Oct 21, 2017 · 6fa480b · 6fa480b
1 parent 1a71281
commit 6fa480b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/zope/app/server/tests/test_ftp.py b/src/zope/app/server/tests/test_ftp.py
@@ -15,12 +15,17 @@
 """
 import unittest
 
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+
 class Tests(unittest.TestCase):
 
     def test_ftp(self):
         from ZODB.tests.util import DB
         from zope.app.server.ftp import FTPRequestFactory
-        from cStringIO import StringIO
         db = DB()
         factory = FTPRequestFactory(db)
         request = factory(StringIO(''), {'credentials': None, 'path': '/'})

diff --git a/src/zope/app/server/tests/test_mkzopeinstance.py b/src/zope/app/server/tests/test_mkzopeinstance.py
@@ -19,10 +19,14 @@
 import tempfile
 import unittest
 from contextlib import contextmanager
-from StringIO import StringIO
 
 from zope.app.server import mkzopeinstance
 
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 
 @contextmanager
 def capture_output(stdout=None, stderr=None):