mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
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:
parent
57f6a55daf
commit
1fcfe211f4
3 changed files with 3 additions and 22 deletions
|
@ -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
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue