[Python-3000-checkins] r64522 - in python/branches/py3k: Lib/multiprocessing/connection.py Lib/multiprocessing/managers.py Lib/multiprocessing/process.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Jun 25 14:54:22 2008
New Revision: 64522

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/multiprocessing/connection.py
   python/branches/py3k/Lib/multiprocessing/managers.py
   python/branches/py3k/Lib/multiprocessing/process.py

Modified: python/branches/py3k/Lib/multiprocessing/connection.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/connection.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/connection.py	Wed Jun 25 14:54:22 2008
@@ -352,14 +352,9 @@
 
 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

Modified: python/branches/py3k/Lib/multiprocessing/managers.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/managers.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/managers.py	Wed Jun 25 14:54:22 2008
@@ -33,15 +33,6 @@
     from pickle import PicklingError
 
 #
-#
-#
-
-try:
-    bytes
-except NameError:
-    bytes = str                  # XXX not needed in Py2.6 and Py3.0
-
-#
 # Register some things for pickling
 #
 

Modified: python/branches/py3k/Lib/multiprocessing/process.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/process.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/process.py	Wed Jun 25 14:54:22 2008
@@ -26,11 +26,6 @@
 except OSError:
     ORIGINAL_DIR = None
 
-try:
-    bytes
-except NameError:
-    bytes = str                  # XXX not needed in Py2.6 and Py3.0
-
 #
 # Public functions
 #