summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2009-01-18 19:44:02 (GMT)
committerJesse Noller <jnoller@gmail.com>2009-01-18 19:44:02 (GMT)
commitf70a538f20c7113ee989c9f4663c7c2b34e62f26 (patch)
treef823f18f654816046c2a2a372ef1f6bd07f51612 /Lib/multiprocessing
parent38d54f7867843c7661eee244e19cf8c27ea7c3f1 (diff)
downloadcpython-f70a538f20c7113ee989c9f4663c7c2b34e62f26.zip
cpython-f70a538f20c7113ee989c9f4663c7c2b34e62f26.tar.gz
cpython-f70a538f20c7113ee989c9f4663c7c2b34e62f26.tar.bz2
Issues #10867: remove old cPickle imports from multiprocessing
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/forking.py6
-rw-r--r--Lib/multiprocessing/managers.py6
2 files changed, 2 insertions, 10 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index e1a64df..3c0f568 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -151,14 +151,10 @@ else:
import _subprocess
import time
+ from pickle import dump, load, HIGHEST_PROTOCOL
from ._multiprocessing import win32, Connection, PipeConnection
from .util import Finalize
- #try:
- # from cPickle import dump, load, HIGHEST_PROTOCOL
- #except ImportError:
- from pickle import load, HIGHEST_PROTOCOL
-
def dump(obj, file, protocol=None):
ForkingPickler(file, protocol).dump(obj)
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index f895c12..78c1fe7 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
#