From: Raymond Hettinger Date: Wed, 20 Apr 2011 20:11:38 +0000 (-0700) Subject: Minor text rearrangement. X-Git-Tag: v2.7.2rc1~130 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3674c8591fde41b6d3e7cf4e3517be71778bc9f4;p=python Minor text rearrangement. --- diff --git a/Lib/collections.py b/Lib/collections.py index 28a2abf44f..c889ab37f3 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -112,16 +112,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,) - def clear(self): 'od.clear() -> None. Remove all items from od.' try: @@ -190,6 +180,16 @@ class OrderedDict(dict): return '%s()' % (self.__class__.__name__,) return '%s(%r)' % (self.__class__.__name__, self.items()) + 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)