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
........

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 891795de6c84ee0d64fd736a349c60a3d856a1e4..dd3ff1b787ed32f5945cbaf617a776638f22ac7a 100644 (file)
--- 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,