From 1fcfe211f436feefbf6101f1f5dac145742c9462 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Jun 2008 12:54:22 +0000
Subject: [PATCH] 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
........
---
Lib/multiprocessing/connection.py | 11 +++--------
Lib/multiprocessing/managers.py | 9 ---------
Lib/multiprocessing/process.py | 5 -----
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 27c44cdda5..8493ac0ece 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
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index b08b60723b..e4d1688387 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -32,15 +32,6 @@ try:
except ImportError:
from pickle import PicklingError
-#
-#
-#
-
-try:
- bytes
-except NameError:
- bytes = str # XXX not needed in Py2.6 and Py3.0
-
#
# Register some things for pickling
#
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 4eb9d723ad..1f89dbab51 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -26,11 +26,6 @@ try:
except OSError:
ORIGINAL_DIR = None
-try:
- bytes
-except NameError:
- bytes = str # XXX not needed in Py2.6 and Py3.0
-
#
# Public functions
#
--
2.49.0