[Python-3000-checkins] r66027 - in python/branches/py3k: Lib/test/test_multiprocessing.py

[neal.norwitz]

Author: neal.norwitz
Date: Mon Aug 25 05:05:54 2008
New Revision: 66027

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_multiprocessing.py

Modified: python/branches/py3k/Lib/test/test_multiprocessing.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multiprocessing.py	(original)
+++ python/branches/py3k/Lib/test/test_multiprocessing.py	Mon Aug 25 05:05:54 2008
@@ -1742,7 +1742,7 @@
     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 @@
                 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,