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

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 27c44cdda50e7b2ea58499b9f95865bdac851c7c..8493ac0ece67821ec12c25d099c00daff4cb4478 100644 (file)
--- 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 b08b60723b760b26df02ded2f0d506b51167d92a..e4d168838712d6f7d0e2073024ede0b9b175f27a 100644 (file)
--- 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 4eb9d723ad420e21bf179e83bd8fe27ace396ca7..1f89dbab512c464f83f84a5daa0c85ab371fc901 100644 (file)
--- 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
 #