From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 25 Aug 2008 03:03:25 +0000 (+0000)
Subject: Use bytes as return type from recv_bytes() methods.  Not sure why this only
X-Git-Tag: v2.6rc1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a7767a17311cada06240a187c8896bdbcc1a4d0;p=thirdparty%2FPython%2Fcpython.git

Use bytes as return type from recv_bytes() methods.  Not sure why this only
affects some buildbots.

R=Brett
TESTED=./python -E -tt ./Lib/test/regrtest.py test_multiprocessing
---

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index d64c5619e6b3..214a420708bc 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1741,7 +1741,7 @@ class OtherTest(unittest.TestCase):
     def test_deliver_challenge_auth_failure(self):
         class _FakeConnection(object):
             def recv_bytes(self, size):
-                return 'something bogus'
+                return b'something bogus'
             def send_bytes(self, data):
                 pass
         self.assertRaises(multiprocessing.AuthenticationError,
@@ -1757,8 +1757,8 @@ class OtherTest(unittest.TestCase):
                 if self.count == 1:
                     return multiprocessing.connection.CHALLENGE
                 elif self.count == 2:
-                    return 'something bogus'
-                return ''
+                    return b'something bogus'
+                return b''
             def send_bytes(self, data):
                 pass
         self.assertRaises(multiprocessing.AuthenticationError,