Commit 9d4ba397 authored by Eric Smith's avatar Eric Smith

Removed used_args param from string.Formatter.get_field. It was left in by...

Removed used_args param from string.Formatter.get_field.  It was left in by mistake from an earlier edit.
parent c79461b1
...@@ -125,7 +125,7 @@ formatting behaviors using the same implementation as the built-in ...@@ -125,7 +125,7 @@ formatting behaviors using the same implementation as the built-in
field, then the values of *field_name*, *format_spec* and *conversion* field, then the values of *field_name*, *format_spec* and *conversion*
will be ``None``. will be ``None``.
.. method:: get_field(field_name, args, kwargs, used_args) .. method:: get_field(field_name, args, kwargs)
Given *field_name* as returned by :meth:`parse` (see above), convert it to Given *field_name* as returned by :meth:`parse` (see above), convert it to
an object to be formatted. Returns a tuple (obj, used_key). The default an object to be formatted. Returns a tuple (obj, used_key). The default
......
...@@ -217,7 +217,7 @@ class Formatter: ...@@ -217,7 +217,7 @@ class Formatter:
# given the field_name, find the object it references # given the field_name, find the object it references
# and the argument it came from # and the argument it came from
obj, arg_used = self.get_field(field_name, args, kwargs, used_args) obj, arg_used = self.get_field(field_name, args, kwargs)
used_args.add(arg_used) used_args.add(arg_used)
# do any conversion on the resulting object # do any conversion on the resulting object
...@@ -272,11 +272,9 @@ class Formatter: ...@@ -272,11 +272,9 @@ class Formatter:
# or "lookup[3]" # or "lookup[3]"
# used_args: a set of which args have been used # used_args: a set of which args have been used
# args, kwargs: as passed in to vformat # args, kwargs: as passed in to vformat
# also, mark it as used in 'used_args' def get_field(self, field_name, args, kwargs):
def get_field(self, field_name, args, kwargs, used_args):
first, rest = field_name._formatter_field_name_split() first, rest = field_name._formatter_field_name_split()
used_args.add(first)
obj = self.get_value(first, args, kwargs) obj = self.get_value(first, args, kwargs)
# loop through the rest of the field_name, doing # loop through the rest of the field_name, doing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment