[Python-checkins] r81837 - in python/branches/release31-maint: Lib/test/test_unicode.py Misc/NEWS Objects/stringlib/string_format.h

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Jun  8 17:12:17 2010
New Revision: 81837

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

................
  r81823 | benjamin.peterson | 2010-06-07 17:31:26 -0500 (Mon, 07 Jun 2010) | 9 lines
  
  Merged revisions 81820 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81820 | benjamin.peterson | 2010-06-07 17:23:23 -0500 (Mon, 07 Jun 2010) | 1 line
    
    correctly overflow when indexes are too large
  ........
................
  r81835 | benjamin.peterson | 2010-06-08 09:57:22 -0500 (Tue, 08 Jun 2010) | 9 lines
  
  Merged revisions 81834 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81834 | benjamin.peterson | 2010-06-08 09:53:29 -0500 (Tue, 08 Jun 2010) | 1 line
    
    kill extra word
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_unicode.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Objects/stringlib/string_format.h

Modified: python/branches/release31-maint/Lib/test/test_unicode.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_unicode.py	(original)
+++ python/branches/release31-maint/Lib/test/test_unicode.py	Tue Jun  8 17:12:17 2010
@@ -687,6 +687,9 @@
         self.assertRaises(IndexError, "{:}".format)
         self.assertRaises(IndexError, "{:s}".format)
         self.assertRaises(IndexError, "{}".format)
+        big = "23098475029384702983476098230754973209482573"
+        self.assertRaises(ValueError, ("{" + big + "}").format)
+        self.assertRaises(ValueError, ("{[" + big + "]}").format, [0])
 
         # issue 6089
         self.assertRaises(ValueError, "{0[0]x}".format, [None])

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Jun  8 17:12:17 2010
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- In the str.format(), raise a ValueError when indexes to arguments are too
+  large.
+
 - Issue #8766: Initialize _warnings module before importing the first module.
   Fix a crash if an empty directory called "encodings" exists in sys.path.
 

Modified: python/branches/release31-maint/Objects/stringlib/string_format.h
==============================================================================
--- python/branches/release31-maint/Objects/stringlib/string_format.h	(original)
+++ python/branches/release31-maint/Objects/stringlib/string_format.h	Tue Jun  8 17:12:17 2010
@@ -373,6 +373,8 @@
         if (_FieldNameIterator_item(self, name) == 0)
             return 0;
         *name_idx = get_integer(name);
+        if (*name_idx == -1 && PyErr_Occurred())
+            return 0;
         break;
     default:
         /* Invalid character follows ']' */
@@ -429,6 +431,8 @@
 
     /* see if "first" is an integer, in which case it's used as an index */
     *first_idx = get_integer(first);
+    if (*first_idx == -1 && PyErr_Occurred())
+        return 0;
 
     field_name_is_empty = first->ptr >= first->end;