get rid of 2.6/3.0 switch statements in multiprocessing

diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py
index dd0f07b046b435bc924940e1bf0a48e860a86ef6..be1bf4a5ab398efd4ecaf22edbaa52f1ab264b91 100644 (file)
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -53,30 +53,18 @@ class DummyProcess(threading.Thread):
         else:
             return None
 
-    # XXX
-    if sys.version_info < (3, 0):
-        is_alive = threading.Thread.is_alive.im_func
-        get_name = threading.Thread.get_name.im_func
-        set_name = threading.Thread.set_name.im_func
-        is_daemon = threading.Thread.is_daemon.im_func
-        set_daemon = threading.Thread.set_daemon.im_func
-    else:
-        is_alive = threading.Thread.is_alive
-        get_name = threading.Thread.get_name
-        set_name = threading.Thread.set_name
-        is_daemon = threading.Thread.is_daemon
-        set_daemon = threading.Thread.set_daemon
+    is_alive = threading.Thread.is_alive.im_func
+    get_name = threading.Thread.get_name.im_func
+    set_name = threading.Thread.set_name.im_func
+    is_daemon = threading.Thread.is_daemon.im_func
+    set_daemon = threading.Thread.set_daemon.im_func
 
 #
 #
 #
 
 class Condition(threading._Condition):
-    # XXX
-    if sys.version_info < (3, 0):
-        notify_all = threading._Condition.notify_all.im_func
-    else:
-        notify_all = threading._Condition.notify_all
+    notify_all = threading._Condition.notify_all.im_func
 
 #
 #

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index f4da209fa61e12a97c8292249b96aed5b41ae72b..1460d6c566bc252c2a225a4e6e57afee850ddc47 100644 (file)
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -41,11 +41,6 @@ def reduce_array(a):
 copy_reg.pickle(array.array, reduce_array)
 
 view_types = [type(getattr({}, name)()) for name in ('items','keys','values')]
-if view_types[0] is not list:       # XXX only needed in Py3.0
-    def rebuild_as_list(obj):
-        return list, (list(obj),)
-    for view_type in view_types:
-        copy_reg.pickle(view_type, rebuild_as_list)
 
 #
 # Type for identifying shared objects