summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2007-09-02 15:33:26 (GMT)
committerEric Smith <eric@trueblade.com>2007-09-02 15:33:26 (GMT)
commit9d4ba3970fa704599769de3676be319133fcaba4 (patch)
tree6d765fab63aee0c2cfe3db5ef25daf9cdc058d23
parentc79461b1648c9209c3652184572a17eef0a76202 (diff)
downloadcpython-9d4ba3970fa704599769de3676be319133fcaba4.zip
cpython-9d4ba3970fa704599769de3676be319133fcaba4.tar.gz
cpython-9d4ba3970fa704599769de3676be319133fcaba4.tar.bz2
Removed used_args param from string.Formatter.get_field. It was left in by mistake from an earlier edit.
-rw-r--r--Doc/library/string.rst2
-rw-r--r--Lib/string.py6
2 files changed, 3 insertions, 5 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 7810e46..b0061b7 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -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*
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
an object to be formatted. Returns a tuple (obj, used_key). The default
diff --git a/Lib/string.py b/Lib/string.py
index ff21eb1..9b00a62 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -217,7 +217,7 @@ class Formatter:
# given the field_name, find the object it references
# 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)
# do any conversion on the resulting object
@@ -272,11 +272,9 @@ class Formatter:
# or "lookup[3]"
# used_args: a set of which args have been used
# args, kwargs: as passed in to vformat
- # also, mark it as used in 'used_args'
- def get_field(self, field_name, args, kwargs, used_args):
+ def get_field(self, field_name, args, kwargs):
first, rest = field_name._formatter_field_name_split()
- used_args.add(first)
obj = self.get_value(first, args, kwargs)
# loop through the rest of the field_name, doing