[Python-checkins] cpython (3.4): Reverted 16efa8d27e4c after discussion with Eric.

[vinay.sajip]

http://hg.python.org/cpython/rev/4c65f8641d89
changeset:   90319:4c65f8641d89
branch:      3.4
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Tue Apr 15 13:52:21 2014 +0100
summary:
  Reverted 16efa8d27e4c after discussion with Eric.

files:
  Lib/test/test_types.py     |  2 --
  Misc/NEWS                  |  4 ----
  Python/formatter_unicode.c |  7 -------
  3 files changed, 0 insertions(+), 13 deletions(-)


diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -343,8 +343,6 @@
         self.assertRaises(ValueError, 3 .__format__, ",n")
         # can't have ',' with 'c'
         self.assertRaises(ValueError, 3 .__format__, ",c")
-        # can't have '#' with 'c'
-        self.assertRaises(ValueError, 3 .__format__, "#c")
 
         # ensure that only int and float type specifiers work
         for format_spec in ([chr(x) for x in range(ord('a'), ord('z')+1)] +
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,10 +34,6 @@
   replacement fields. It now matches the behavior of str.format() in
   this regard. Patches by Phil Elson and Ramchandra Apte.
 
-- Issue #8931: Make alternate formatting ('#') for type 'c' raise an
-  exception. It had no effect, now trying to specify it is an error.
-  Patch by Torsten Landschoff.
-
 Library
 -------
 
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -846,13 +846,6 @@
                             " format specifier 'c'");
             goto done;
         }
-        /* error to request alternate format */
-        if (format->alternate) {
-            PyErr_SetString(PyExc_ValueError,
-                            "Alternate form (#) not allowed with integer"
-                            " format specifier 'c'");
-            goto done;
-        }
 
         /* taken from unicodeobject.c formatchar() */
         /* Integer input truncated to a character */

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