mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

PEP 3101: Removed _formatter_xxx routines from sysmodule, and made them unicode methods instead (per GvR suggestion).

Browse source
This commit is contained in:
Eric Smith 2007-08-27 11:28:18 +00:00
parent 8cef8a8902
commit e226b55963
4 changed files with 348 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/string.py
View file

@ -200,10 +200,8 @@ class Template(metaclass=_TemplateMetaclass):
# exposed here via the sys module. sys was chosen because it's always
# available and doesn't have to be dynamically loaded.
# The overall parser is implemented in sys._formatter_parser.
# The field name parser is implemented in sys._formatter_field_name_split
from sys import _formatter_parser, _formatter_field_name_split
# The overall parser is implemented in str._formatter_parser.
# The field name parser is implemented in str._formatter_field_name_split
class Formatter:
def format(self, format_string, *args, **kwargs):
@ -213,13 +211,13 @@ class Formatter:
used_args = set()
result = []
for (is_markup, literal, field_name, format_spec, conversion) in \
_formatter_parser(format_string):
format_string._formatter_parser():
if is_markup:
# given the field_name, find the object it references
# split it into the first part, and and iterator that
# looks over the rest
first, rest = _formatter_field_name_split(field_name)
first, rest = field_name._formatter_field_name_split()
used_args.add(first)
obj = self.get_value(first, args, kwargs)