mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #25034: Merge from 3.5.

Browse source
This commit is contained in:
Eric V. Smith 2015-09-29 10:30:47 -04:00
commit 6dcada3bcf
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/string.py
View file

@ -183,7 +183,7 @@ class Formatter:
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 @@ class Formatter:
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):