[Python-checkins] cpython (merge 3.1 -> 3.2): Minor text rearrangement.

[raymond.hettinger]

http://hg.python.org/cpython/rev/235633dbbf9a
changeset:   69493:235633dbbf9a
branch:      3.2
parent:      69489:7ed8e898cbdf
parent:      69492:e9979852fc02
user:        Raymond Hettinger <python at rcn.com>
date:        Wed Apr 20 13:08:40 2011 -0700
summary:
  Minor text rearrangement.

files:
  Lib/collections.py |  20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/Lib/collections.py b/Lib/collections.py
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -151,16 +151,6 @@
             link.next = first
             root.next = first.prev = link
 
-    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 __sizeof__(self):
         sizeof = _sys.getsizeof
         n = len(self) + 1                       # number of links including root
@@ -201,6 +191,16 @@
             return '%s()' % (self.__class__.__name__,)
         return '%s(%r)' % (self.__class__.__name__, list(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)

-- 
Repository URL: http://hg.python.org/cpython