From ec105ad47f83bf31797b2d14f5f951d1f9490414 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Mon, 25 Aug 2008 03:05:54 +0000 Subject: Merged revisions 66026 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r66026 | neal.norwitz | 2008-08-24 20:03:25 -0700 (Sun, 24 Aug 2008) | 6 lines 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 ........ --- Lib/test/test_multiprocessing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 891795d..dd3ff1b 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1742,7 +1742,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, @@ -1758,8 +1758,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, -- cgit v0.12