summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/managers.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-25 12:54:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-25 12:54:22 (GMT)
commit1fcfe211f436feefbf6101f1f5dac145742c9462 (patch)
tree70ff0cc6bf2e8a3f0a01014c1cd0059a94ae7302 /Lib/multiprocessing/managers.py
parent57f6a55daf987437d9da229e4e476ebb82419d02 (diff)
downloadcpython-1fcfe211f436feefbf6101f1f5dac145742c9462.zip
cpython-1fcfe211f436feefbf6101f1f5dac145742c9462.tar.gz
cpython-1fcfe211f436feefbf6101f1f5dac145742c9462.tar.bz2
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 ........
Diffstat (limited to 'Lib/multiprocessing/managers.py')
-rw-r--r--Lib/multiprocessing/managers.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index b08b607..e4d1688 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -33,15 +33,6 @@ 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
#