Author: eric.smith
Date: Sun Sep 2 17:33:26 2007
New Revision: 57906
Modified:
python/branches/py3k/Doc/library/string.rst
python/branches/py3k/Lib/string.py
Log:
Removed used_args param from string.Formatter.get_field. It was left in by
mistake from an earlier edit.
Modified: python/branches/py3k/Doc/library/string.rst
==============================================================================
--- python/branches/py3k/Doc/library/string.rst (original)
+++ python/branches/py3k/Doc/library/string.rst Sun Sep 2 17:33:26 2007
@@ -125,7 +125,7 @@
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
Modified: python/branches/py3k/Lib/string.py
==============================================================================
--- python/branches/py3k/Lib/string.py (original)
+++ python/branches/py3k/Lib/string.py Sun Sep 2 17:33:26 2007
@@ -217,7 +217,7 @@
# 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 @@
# 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
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
