Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
........
This commit is contained in:
Benjamin Peterson 2008-06-25 12:54:22 +00:00
parent 57f6a55daf
commit 1fcfe211f4
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/multiprocessing/connection.py
View File

@ -352,14 +352,9 @@ if sys.platform == 'win32':
MESSAGE_LENGTH = 20 MESSAGE_LENGTH = 20
CHALLENGE = '#CHALLENGE#' CHALLENGE = b'#CHALLENGE#'
WELCOME = '#WELCOME#' WELCOME = b'#WELCOME#'
FAILURE = '#FAILURE#' FAILURE = b'#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')
def deliver_challenge(connection, authkey): def deliver_challenge(connection, authkey):
import hmac import hmac

9
Lib/multiprocessing/managers.py
View File

@ -32,15 +32,6 @@ try:
except ImportError: except ImportError:
from pickle import PicklingError from pickle import PicklingError
#
#
#
try:
bytes
except NameError:
bytes = str # XXX not needed in Py2.6 and Py3.0
# #
# Register some things for pickling # Register some things for pickling
# #

5
Lib/multiprocessing/process.py
View File

@ -26,11 +26,6 @@ try:
except OSError: except OSError:
ORIGINAL_DIR = None ORIGINAL_DIR = None
try:
bytes
except NameError:
bytes = str # XXX not needed in Py2.6 and Py3.0
# #
# Public functions # Public functions
# #