[Python-checkins] r74707 - in python/branches/release31-maint: Lib/decimal.py Lib/test/test_decimal.py Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Mon Sep  7 18:23:26 2009
New Revision: 74707

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

................
  r74706 | mark.dickinson | 2009-09-07 17:21:56 +0100 (Mon, 07 Sep 2009) | 10 lines
  
  Merged revisions 74704 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r74704 | mark.dickinson | 2009-09-07 17:17:41 +0100 (Mon, 07 Sep 2009) | 3 lines
    
    Issue #6850: Fix bug in Decimal._parse_format_specifier for formats
    with no type specifier.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/decimal.py
   python/branches/release31-maint/Lib/test/test_decimal.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/decimal.py
==============================================================================
--- python/branches/release31-maint/Lib/decimal.py	(original)
+++ python/branches/release31-maint/Lib/decimal.py	Mon Sep  7 18:23:26 2009
@@ -5592,7 +5592,7 @@
     # if format type is 'g' or 'G' then a precision of 0 makes little
     # sense; convert it to 1.  Same if format type is unspecified.
     if format_dict['precision'] == 0:
-        if format_dict['type'] in 'gG' or format_dict['type'] is None:
+        if format_dict['type'] is None or format_dict['type'] in 'gG':
             format_dict['precision'] = 1
 
     # determine thousands separator, grouping, and decimal separator, and

Modified: python/branches/release31-maint/Lib/test/test_decimal.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_decimal.py	(original)
+++ python/branches/release31-maint/Lib/test/test_decimal.py	Mon Sep  7 18:23:26 2009
@@ -749,6 +749,9 @@
             (',%', '123.456789', '12,345.6789%'),
             (',e', '123456', '1.23456e+5'),
             (',E', '123456', '1.23456E+5'),
+
+            # issue 6850
+            ('a=-7.0', '0.12345', 'aaaa0.1'),
             ]
         for fmt, d, result in test_values:
             self.assertEqual(format(Decimal(d), fmt), result)

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Sep  7 18:23:26 2009
@@ -52,6 +52,9 @@
 Library
 -------
 
+- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats
+  with no type specifier.
+
 - Issue #6239: ctypes.c_char_p return value must return bytes.
 
 - Issue #6838: Use a list to accumulate the value instead of