[Python-checkins] r68728 - in python/branches/py3k: Lib/multiprocessing/forking.py Lib/multiprocessing/managers.py Misc/NEWS (original) (raw)
jesse.noller python-checkins at python.org
Sun Jan 18 20:44:02 CET 2009
- Previous message: [Python-checkins] r68727 - python/trunk/Doc/reference/datamodel.rst
- Next message: [Python-checkins] r68729 - python/branches/py3k/Misc/NEWS
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jesse.noller Date: Sun Jan 18 20:44:02 2009 New Revision: 68728
Log: Issues #10867: remove old cPickle imports from multiprocessing
Modified: python/branches/py3k/Lib/multiprocessing/forking.py python/branches/py3k/Lib/multiprocessing/managers.py python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/multiprocessing/forking.py
--- python/branches/py3k/Lib/multiprocessing/forking.py (original) +++ python/branches/py3k/Lib/multiprocessing/forking.py Sun Jan 18 20:44:02 2009 @@ -151,14 +151,10 @@ 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)Modified: python/branches/py3k/Lib/multiprocessing/managers.py
--- python/branches/py3k/Lib/multiprocessing/managers.py (original) +++ python/branches/py3k/Lib/multiprocessing/managers.py Sun Jan 18 20:44:02 2009 @@ -21,16 +21,12 @@ 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
Modified: python/branches/py3k/Misc/NEWS
--- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Jan 18 20:44:02 2009 @@ -132,6 +132,9 @@ 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.
- Previous message: [Python-checkins] r68727 - python/trunk/Doc/reference/datamodel.rst
- Next message: [Python-checkins] r68729 - python/branches/py3k/Misc/NEWS
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]