diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-06-25 12:44:29 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-06-25 12:44:29 (GMT) |
commit | 264800822a673f4faf9e377f07ea13f636944e75 (patch) | |
tree | 9f7a074f001835662ec9ee8fe6438600d9c10e1d | |
parent | b09c9396cd74a50c237b77c76efa70e4a1aca863 (diff) | |
download | cpython-264800822a673f4faf9e377f07ea13f636944e75.zip cpython-264800822a673f4faf9e377f07ea13f636944e75.tar.gz cpython-264800822a673f4faf9e377f07ea13f636944e75.tar.bz2 |
get rid of 2.6/3.0 switch statements in multiprocessing
-rw-r--r-- | Lib/multiprocessing/dummy/__init__.py | 24 | ||||
-rw-r--r-- | Lib/multiprocessing/managers.py | 5 |
2 files changed, 6 insertions, 23 deletions
diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py index dd0f07b..be1bf4a 100644 --- 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 f4da209..1460d6c 100644 --- 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 |