From fa511280be49e339d91eb89413abac455114b878 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 26 Oct 2017 17:03:05 +0300
Subject: [PATCH] Use io.BytesIO() for mocking stdout on Python 2

---
 src/zope/server/http/tests/test_wsgiserver.py | 21 ++++++++++---------
 src/zope/server/tests/test_taskthreads.py     | 13 ++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/zope/server/http/tests/test_wsgiserver.py b/src/zope/server/http/tests/test_wsgiserver.py
index 1847d25..7814f80 100644
--- a/src/zope/server/http/tests/test_wsgiserver.py
+++ b/src/zope/server/http/tests/test_wsgiserver.py
@@ -12,12 +12,6 @@
 """Test Publisher-based HTTP Server
 """
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-
-import paste.lint
 import sys
 import unittest
 import warnings
@@ -25,6 +19,9 @@
 from asyncore import socket_map, poll
 from threading import Thread
 from time import sleep
+from io import BytesIO, StringIO
+
+import paste.lint
 from six.moves.http_client import HTTPConnection
 
 from zope.server.taskthreads import ThreadedTaskDispatcher
@@ -48,13 +45,17 @@
 
 HTTPRequest.STAGGER_RETRIES = 0  # Don't pause.
 
+# By using io.BytesIO() instead of cStringIO.StringIO() on Python 2 we make
+# sure we're not trying to accidentally print unicode to stdout/stderr.
+NativeStringIO = BytesIO if str is bytes else StringIO
+
 
 @contextmanager
 def capture_output(stdout=None, stderr=None):
     old_stdout = sys.stdout
     old_stderr = sys.stderr
-    sys.stdout = stdout = stdout or StringIO()
-    sys.stderr = stderr = stderr or StringIO()
+    sys.stdout = stdout = stdout or NativeStringIO()
+    sys.stderr = stderr = stderr or NativeStringIO()
     try:
         yield stdout, stderr
     finally:
@@ -337,7 +338,7 @@ class FakeTask:
             counter = 0
             getCGIEnvironment = lambda _: {}
             class request_data:
-                getBodyStream = lambda _: StringIO()
+                getBodyStream = lambda _: BytesIO()
             request_data = request_data()
             setResponseStatus = appendResponseHeaders = lambda *_: None
             def wroteResponseHeader(self):
@@ -375,7 +376,7 @@ def __init__(self):
                 self.response_headers = {}
             getCGIEnvironment = lambda _: {}
             class request_data:
-                getBodyStream = lambda _: StringIO()
+                getBodyStream = lambda _: BytesIO()
             request_data = request_data()
             def appendResponseHeaders(self, lst):
                 accum = self.accumulated_headers
diff --git a/src/zope/server/tests/test_taskthreads.py b/src/zope/server/tests/test_taskthreads.py
index 25cd008..b9066b9 100644
--- a/src/zope/server/tests/test_taskthreads.py
+++ b/src/zope/server/tests/test_taskthreads.py
@@ -1,14 +1,15 @@
 import doctest
 import logging
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import BytesIO, StringIO
 
 from zope.server.taskthreads import ThreadedTaskDispatcher
 
 
+# By using io.BytesIO() instead of cStringIO.StringIO() on Python 2 we make
+# sure we're not trying to accidentally print unicode to stdout/stderr.
+NativeStringIO = BytesIO if str is bytes else StringIO
+
+
 class CountingDict(dict):
     """A dict that decrements values on every .get()"""
 
@@ -31,7 +32,7 @@ def service(self):
 
 def setUp(test):
     test.logger = logging.getLogger('zope.server.taskthreads')
-    test.logbuf = StringIO()
+    test.logbuf = NativeStringIO()
     test.good_handler = logging.StreamHandler(test.logbuf)
     test.logger.addHandler(test.good_handler)
     test.bad_handler = logging.Handler()