From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Jun 2008 03:09:05 +0000 (+0000)
Subject: remove bytes alias in multiprocessing
X-Git-Tag: v2.6b2~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa164e1bd37cd620463126a5905de5f2e2057f39;p=thirdparty%2FPython%2Fcpython.git

remove bytes alias in multiprocessing
---

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index fb705cb690a6..f4da209fa61e 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -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
 #
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index e1189cff7821..d5d3c401523a 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -26,11 +26,6 @@ try:
 except OSError:
     ORIGINAL_DIR = None
 
-try:
-    bytes
-except NameError:
-    bytes = str                  # XXX not needed in Py2.6 and Py3.0
-
 #
 # Public functions
 #