]> granicus.if.org Git - python/commitdiff
Issues #10867: remove old cPickle imports from multiprocessing
authorJesse Noller <jnoller@gmail.com>
Sun, 18 Jan 2009 19:44:02 +0000 (19:44 +0000)
committerJesse Noller <jnoller@gmail.com>
Sun, 18 Jan 2009 19:44:02 +0000 (19:44 +0000)
Lib/multiprocessing/forking.py
Lib/multiprocessing/managers.py
Misc/NEWS

index e1a64df2bbfe2986c0a0a637415a0e082bf86099..3c0f568927222fecdc1099602c83ff72d029f59e 100644 (file)
@@ -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)
 
index f895c129a50a74ad6bf1b35b161ea21176955c04..78c1fe715643e5e1152217b99a9a6101fcbc2c4f 100644 (file)
@@ -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
 #
index b1c5d7fcb6170757e936d72fe26c71d300f60e59..499e5425077f01b68e700f70a1687f0b8b0383ae 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10867: Remove python2.x try: except: imports for old cPickle from
+  multiprocessing. 
+
 - Issue #4959: inspect.formatargspec now works for keyword only arguments
   without defaults.