summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/connection.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-25 12:54:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-25 12:54:22 (GMT)
commit1fcfe211f436feefbf6101f1f5dac145742c9462 (patch)
tree70ff0cc6bf2e8a3f0a01014c1cd0059a94ae7302 /Lib/multiprocessing/connection.py
parent57f6a55daf987437d9da229e4e476ebb82419d02 (diff)
downloadcpython-1fcfe211f436feefbf6101f1f5dac145742c9462.zip
cpython-1fcfe211f436feefbf6101f1f5dac145742c9462.tar.gz
cpython-1fcfe211f436feefbf6101f1f5dac145742c9462.tar.bz2
Merged revisions 64517,64519 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64517 | benjamin.peterson | 2008-06-24 22:09:05 -0500 (Tue, 24 Jun 2008) | 1 line remove bytes alias in multiprocessing ........ r64519 | benjamin.peterson | 2008-06-25 07:39:05 -0500 (Wed, 25 Jun 2008) | 1 line use byte literals in multiprocessing ........
Diffstat (limited to 'Lib/multiprocessing/connection.py')
-rw-r--r--Lib/multiprocessing/connection.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 27c44cd..8493ac0 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -352,14 +352,9 @@ if sys.platform == 'win32':
MESSAGE_LENGTH = 20
-CHALLENGE = '#CHALLENGE#'
-WELCOME = '#WELCOME#'
-FAILURE = '#FAILURE#'
-
-if sys.version_info >= (3, 0): # XXX can use bytes literals in 2.6/3.0
- CHALLENGE = CHALLENGE.encode('ascii')
- WELCOME = WELCOME.encode('ascii')
- FAILURE = FAILURE.encode('ascii')
+CHALLENGE = b'#CHALLENGE#'
+WELCOME = b'#WELCOME#'
+FAILURE = b'#FAILURE#'
def deliver_challenge(connection, authkey):
import hmac