Fixed issue #25034: Fix string.Formatter problem with auto-numbering
and nested format_specs. Patch by Anthon van der Neut.
diff --git a/Lib/string.py b/Lib/string.py
index a4c48b2..ef0787f 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -185,7 +185,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
@@ -232,14 +232,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
index 30fe42a..57963bf 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -54,6 +54,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
index 853f29d..6b4af44 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -984,6 +984,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
index b68d702..0a2411d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,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