[Python-checkins] cpython (merge 3.5 -> default): Issue #25034: Merge from 3.5.
eric.smith
python-checkins at python.org
Tue Sep 29 16:31:19 CEST 2015
https://hg.python.org/cpython/rev/aef6365294c8
changeset: 98395:aef6365294c8
parent: 98391:377f200ad521
parent: 98394:65d7b4fd0332
user: Eric V. Smith <eric at trueblade.com>
date: Tue Sep 29 10:30:47 2015 -0400
summary:
Issue #25034: Merge from 3.5.
files:
Lib/string.py | 11 ++++++-----
Lib/test/test_string.py | 2 ++
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Lib/string.py b/Lib/string.py
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -183,7 +183,7 @@
def vformat(self, format_string, args, kwargs):
used_args = set()
- result = self._vformat(format_string, args, kwargs, used_args, 2)
+ result, _ = self._vformat(format_string, args, kwargs, used_args, 2)
self.check_unused_args(used_args, args, kwargs)
return result
@@ -230,14 +230,15 @@
obj = self.convert_field(obj, conversion)
# expand the format spec, if needed
- format_spec = self._vformat(format_spec, args, kwargs,
- used_args, recursion_depth-1,
- auto_arg_index=auto_arg_index)
+ format_spec, auto_arg_index = self._vformat(
+ format_spec, args, kwargs,
+ used_args, recursion_depth-1,
+ auto_arg_index=auto_arg_index)
# format the object and append to the result
result.append(self.format_field(obj, format_spec))
- return ''.join(result)
+ return ''.join(result), auto_arg_index
def get_value(self, key, args, kwargs):
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -58,6 +58,8 @@
'foo{1}{num}{1}'.format(None, 'bar', num=6))
self.assertEqual(fmt.format('{:^{}}', 'bar', 6),
'{:^{}}'.format('bar', 6))
+ self.assertEqual(fmt.format('{:^{}} {}', 'bar', 6, 'X'),
+ '{:^{}} {}'.format('bar', 6, 'X'))
self.assertEqual(fmt.format('{:^{pad}}{}', 'foo', 'bar', pad=6),
'{:^{pad}}{}'.format('foo', 'bar', pad=6))
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1013,6 +1013,7 @@
Trent Nelson
Chad Netzer
Max Neunhöffer
+Anthon van der Neut
George Neville-Neil
Hieu Nguyen
Johannes Nicolai
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -190,6 +190,9 @@
Library
-------
+- Issue #25034: Fix string.Formatter problem with auto-numbering and
+ nested format_specs. Patch by Anthon van der Neut.
+
- Issue #25233: Rewrite the guts of asyncio.Queue to be more understandable and correct.
- Issue #23600: Default implementation of tzinfo.fromutc() was returning
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list