From a6b45cc31d33c166c84866f78d504a99d409895c Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 7 Dec 2004 07:05:57 +0000 Subject: Eliminate the deprecated option to return None instead of a tuple of arguments in __reduce__(). --- Lib/pickle.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'Lib/pickle.py') diff --git a/Lib/pickle.py b/Lib/pickle.py index 4c9188830a..02a1b1d1ae 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -33,7 +33,6 @@ import marshal import sys import struct import re -import warnings __all__ = ["PickleError", "PicklingError", "UnpicklingError", "Pickler", "Unpickler", "dump", "dumps", "load", "loads"] @@ -349,14 +348,7 @@ class Pickler: # Assert that args is a tuple or None if not isinstance(args, TupleType): - if args is None: - # A hack for Jim Fulton's ExtensionClass, now deprecated. - # See load_reduce() - warnings.warn("__basicnew__ special case is deprecated", - DeprecationWarning) - else: - raise PicklingError( - "args from reduce() should be a tuple") + raise PicklingError("args from reduce() should be a tuple") # Assert that func is callable if not callable(func): @@ -1138,13 +1130,7 @@ class Unpickler: stack = self.stack args = stack.pop() func = stack[-1] - if args is None: - # A hack for Jim Fulton's ExtensionClass, now deprecated - warnings.warn("__basicnew__ special case is deprecated", - DeprecationWarning) - value = func.__basicnew__() - else: - value = func(*args) + value = func(*args) stack[-1] = value dispatch[REDUCE] = load_reduce -- cgit v1.2.1