[Python-checkins] r82917 - in python/branches/release27-maint: Lib/pickletools.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Fri Jul 16 16:53:52 2010
New Revision: 82917

Log:
Merged revisions 82915 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82915 | alexander.belopolsky | 2010-07-16 10:39:45 -0400 (Fri, 16 Jul 2010) | 1 line
  
  Corrected TUPLE<N> opcodes' docs.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/pickletools.py

Modified: python/branches/release27-maint/Lib/pickletools.py
==============================================================================
--- python/branches/release27-maint/Lib/pickletools.py	(original)
+++ python/branches/release27-maint/Lib/pickletools.py	Fri Jul 16 16:53:52 2010
@@ -1214,10 +1214,11 @@
       stack_before=[anyobject],
       stack_after=[pytuple],
       proto=2,
-      doc="""One-tuple.
+      doc="""Build a one-tuple out of the topmost item on the stack.
 
       This code pops one value off the stack and pushes a tuple of
-      length 1 whose one item is that value back onto it.  IOW:
+      length 1 whose one item is that value back onto it.  In other
+      words:
 
           stack[-1] = tuple(stack[-1:])
       """),
@@ -1228,10 +1229,11 @@
       stack_before=[anyobject, anyobject],
       stack_after=[pytuple],
       proto=2,
-      doc="""One-tuple.
+      doc="""Build a two-tuple out of the top two items on the stack.
 
-      This code pops two values off the stack and pushes a tuple
-      of length 2 whose items are those values back onto it.  IOW:
+      This code pops two values off the stack and pushes a tuple of
+      length 2 whose items are those values back onto it.  In other
+      words:
 
           stack[-2:] = [tuple(stack[-2:])]
       """),
@@ -1242,10 +1244,11 @@
       stack_before=[anyobject, anyobject, anyobject],
       stack_after=[pytuple],
       proto=2,
-      doc="""One-tuple.
+      doc="""Build a three-tuple out of the top three items on the stack.
 
-      This code pops three values off the stack and pushes a tuple
-      of length 3 whose items are those values back onto it.  IOW:
+      This code pops three values off the stack and pushes a tuple of
+      length 3 whose items are those values back onto it.  In other
+      words:
 
           stack[-3:] = [tuple(stack[-3:])]
       """),