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

View file

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