From f70a538f20c7113ee989c9f4663c7c2b34e62f26 Mon Sep 17 00:00:00 2001 From: Jesse Noller Date: Sun, 18 Jan 2009 19:44:02 +0000 Subject: Issues #10867: remove old cPickle imports from multiprocessing --- Lib/multiprocessing/managers.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Lib/multiprocessing/managers.py') diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index f895c129a5..78c1fe7156 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -21,16 +21,12 @@ import array import queue from traceback import format_exc +from pickle import PicklingError from multiprocessing import Process, current_process, active_children, Pool, util, connection from multiprocessing.process import AuthenticationString from multiprocessing.forking import exit, Popen, assert_spawning, ForkingPickler from multiprocessing.util import Finalize, info -try: - from cPickle import PicklingError -except ImportError: - from pickle import PicklingError - # # Register some things for pickling # -- cgit v1.2.1