summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_multiprocessing.py
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2008-08-25 03:05:54 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2008-08-25 03:05:54 (GMT)
commitec105ad47f83bf31797b2d14f5f951d1f9490414 (patch)
tree2c2c661b70fe120882471f413f99675f95604c5f /Lib/test/test_multiprocessing.py
parent5d6415ee26fcd663806ed3a19247573c5ca5f055 (diff)
downloadcpython-ec105ad47f83bf31797b2d14f5f951d1f9490414.zip
cpython-ec105ad47f83bf31797b2d14f5f951d1f9490414.tar.gz
cpython-ec105ad47f83bf31797b2d14f5f951d1f9490414.tar.bz2
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 ........
Diffstat (limited to 'Lib/test/test_multiprocessing.py')
-rw-r--r--Lib/test/test_multiprocessing.py6
1 files 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,