SF bug #795506: Wrong handling of string format code for float values.

Adding missing support for '%F'.

Will backport to 2.3.1.

Lib/test/string_tests.py

@@ -550,6 +550,7 @@ def test_formatting(self):
 
         self.checkequal(' 42', '%3ld', '__mod__', 42)
         self.checkequal('0042.00', '%07.2f', '__mod__', 42)
+        self.checkequal('0042.00', '%07.2F', '__mod__', 42)
 
         self.checkraises(TypeError, 'abc', '__mod__')
         self.checkraises(TypeError, '%(foo)s', '__mod__', 42)

Misc/NEWS

@@ -12,6 +12,9 @@ What's New in Python 2.4 alpha 1?
 Core and builtins
 -----------------
 
+- The % formatting operator now supports '%F' which is equivalent to
+  '%f'.  This has always been documented but never implemented.
+
 - complex(obj) could leak a little memory if obj wasn't a string or
   number.
 

Objects/stringobject.c

@@ -3921,8 +3921,11 @@ PyString_Format(PyObject *format, PyObject *args)
 			case 'e':
 			case 'E':
 			case 'f':
+			case 'F':
 			case 'g':
 			case 'G':
+				if (c == 'F')
+					c = 'f';
 				pbuf = formatbuf;
 				len = formatfloat(pbuf, sizeof(formatbuf),
 						  flags, prec, c, v);

Objects/unicodeobject.c

@@ -6540,8 +6540,11 @@ PyObject *PyUnicode_Format(PyObject *format,
 	    case 'e':
 	    case 'E':
 	    case 'f':
+	    case 'F':
 	    case 'g':
 	    case 'G':
+		if (c == 'F')
+			c = 'f';
 		pbuf = formatbuf;
 		len = formatfloat(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
 			flags, prec, c, v);