From fc330aeb6f6968d1b843b47c8d7f36a708eb5b0c Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Wed, 20 Apr 2011 13:03:49 -0700 Subject: [PATCH] Minor text rearrangement. --- Lib/collections.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/collections.py b/Lib/collections.py index 79912ecba1f..b2a590bd771 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -98,16 +98,6 @@ class OrderedDict(dict): yield curr.key curr = curr.prev - def __reduce__(self): - 'Return state information for pickling' - items = [[k, self[k]] for k in self] - inst_dict = vars(self).copy() - for k in vars(OrderedDict()): - inst_dict.pop(k, None) - if inst_dict: - return (self.__class__, (items,), inst_dict) - return self.__class__, (items,) - update = __update = MutableMapping.update keys = MutableMapping.keys values = MutableMapping.values @@ -156,6 +146,16 @@ class OrderedDict(dict): self.__in_repr = False return result + def __reduce__(self): + 'Return state information for pickling' + items = [[k, self[k]] for k in self] + inst_dict = vars(self).copy() + for k in vars(OrderedDict()): + inst_dict.pop(k, None) + if inst_dict: + return (self.__class__, (items,), inst_dict) + return self.__class__, (items,) + def copy(self): 'od.copy() -> a shallow copy of od' return self.__class__(self)