Fix SF # 635969, No error "not all arguments converted"

When mwh added extended slicing, strings and unicode became mappings.
Thus, dict was set which prevented an error when doing:
	newstr = 'format without a percent' % string_value

This fix raises an exception again when there are no formats
and % with a string value.

diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index b40e8202f1b6f2009d2378a3788c7f643d7b8b50..da4d85ab3c5bd865bb8d553bd74488451911aeb9 100644 (file)
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -221,6 +221,14 @@ if have_unicode:
 
 test_exc('%d', '1', TypeError, "int argument required")
 test_exc('%g', '1', TypeError, "float argument required")
+test_exc('no format', '1', TypeError, 
+         "not all arguments converted during string formatting")
+test_exc('no format', u'1', TypeError, 
+         "not all arguments converted during string formatting")
+test_exc(u'no format', '1', TypeError, 
+         "not all arguments converted during string formatting")
+test_exc(u'no format', u'1', TypeError, 
+         "not all arguments converted during string formatting")
 
 if sys.maxint == 2**32-1:
     # crashes 2.2.1 and earlier:

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 35b4b47e986438ccf6f81919a3cd9e1f2ed5ded7..bf8bad53a83c86f5af8fe87f274615689a9e3be6 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -3622,7 +3622,8 @@ PyString_Format(PyObject *format, PyObject *args)
                arglen = -1;
                argidx = -2;
        }
-       if (args->ob_type->tp_as_mapping && !PyTuple_Check(args))
+       if (args->ob_type->tp_as_mapping && !PyTuple_Check(args) &&
+           !PyObject_TypeCheck(args, &PyBaseString_Type))
                dict = args;
        while (--fmtcnt >= 0) {
                if (*fmt != '%') {

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index c1cdebc0e8e9e10b00a5120b05c21eb6f9951af5..12846bf49b8c08f0c3410bd295cfa6407ebe8c0a 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6181,7 +6181,8 @@ PyObject *PyUnicode_Format(PyObject *format,
        arglen = -1;
        argidx = -2;
     }
-    if (args->ob_type->tp_as_mapping && !PyTuple_Check(args))
+    if (args->ob_type->tp_as_mapping && !PyTuple_Check(args) &&
+        !PyObject_TypeCheck(args, &PyBaseString_Type))
        dict = args;
 
     while (--fmtcnt >= 0) {