cpython-lru_cache-weakref: Lib/string.py annotate

annotate Lib/string.py @ 56121:ea697cde6882 3.1

Merged revisions 74881-74885,74888,74891-74895,74900,74905-74906,74931-74932,74934,74941-74942,74944,74956 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74881 | r.david.murray | 2009-09-17 15:12:49 -0400 (Thu, 17 Sep 2009) | 2 lines Check in first draft of maintainers.rst. ........ r74882 | eric.smith | 2009-09-17 15:22:30 -0400 (Thu, 17 Sep 2009) | 1 line Typo. ........ r74883 | mark.dickinson | 2009-09-17 15:37:28 -0400 (Thu, 17 Sep 2009) | 1 line Add some more module maintainers. ........ r74884 | mark.dickinson | 2009-09-17 15:39:12 -0400 (Thu, 17 Sep 2009) | 1 line Revert accidental changes to Objects/longobject.c ........ r74885 | mark.dickinson | 2009-09-17 16:20:01 -0400 (Thu, 17 Sep 2009) | 1 line Add decimal maintainers ........ r74888 | r.david.murray | 2009-09-17 18:10:48 -0400 (Thu, 17 Sep 2009) | 2 lines Maintainer additions from MAL. ........ r74891 | georg.brandl | 2009-09-17 18:18:01 -0400 (Thu, 17 Sep 2009) | 1 line Some more maintainers. ........ r74892 | r.david.murray | 2009-09-17 19:23:56 -0400 (Thu, 17 Sep 2009) | 2 lines Add a couple interest areas for Nick per his request. ........ r74893 | r.david.murray | 2009-09-17 19:43:20 -0400 (Thu, 17 Sep 2009) | 2 lines Benajmin is also compiler-knowledgeable. ........ r74894 | alexandre.vassalotti | 2009-09-17 20:59:05 -0400 (Thu, 17 Sep 2009) | 2 lines Added myself to my areas of interest. ........ r74895 | brett.cannon | 2009-09-17 21:03:35 -0400 (Thu, 17 Sep 2009) | 1 line Add myself to a couple places as maintainer. ........ r74900 | georg.brandl | 2009-09-18 05:06:37 -0400 (Fri, 18 Sep 2009) | 1 line Add myself in interest areas. ........ r74905 | ezio.melotti | 2009-09-18 05:58:43 -0400 (Fri, 18 Sep 2009) | 1 line Add myself in interest areas and mark effbot as inactive in winsound ........ r74906 | antoine.pitrou | 2009-09-18 09:15:23 -0400 (Fri, 18 Sep 2009) | 3 lines Add myself in a couple of places ........ r74931 | r.david.murray | 2009-09-18 17:25:36 -0400 (Fri, 18 Sep 2009) | 5 lines Add some names gleaned from the "Tracker Archeology" thread on python-dev from back in February. Also consolidate the autoconf and makefiles topics into one, and add tracker and svn/hg topics. ........ r74932 | r.david.murray | 2009-09-18 17:32:16 -0400 (Fri, 18 Sep 2009) | 2 lines Remove non-committer mistakenly added. ........ r74934 | r.david.murray | 2009-09-18 17:40:30 -0400 (Fri, 18 Sep 2009) | 2 lines More descriptive/generic name for the svn/hg entry (version control) ........ r74941 | benjamin.peterson | 2009-09-18 18:45:59 -0400 (Fri, 18 Sep 2009) | 1 line add a new category for myself ........ r74942 | benjamin.peterson | 2009-09-18 18:50:55 -0400 (Fri, 18 Sep 2009) | 1 line add myself for symtable ........ r74944 | georg.brandl | 2009-09-19 03:39:05 -0400 (Sat, 19 Sep 2009) | 1 line I would like to maintain the token module! ........ r74956 | r.david.murray | 2009-09-19 14:40:08 -0400 (Sat, 19 Sep 2009) | 3 lines Add everyone who we know has been a release manager as a resource for the 'release management' topic. ........

author	R. David Murray <rdmurray@bitdance.com>
date	Sat, 19 Sep 2009 19:04:37 +0000
parents	238502460795
children	f3c595214abc a37bb59d4b53

rev	line source
41480 99027c2b3fd2 Remove functions in string module that are also string methods. Also remove: Neal Norwitz <nnorwitz@gmail.com> parents: 41226 diff changeset	1 """A collection of string constants.
6964 33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	2
33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	3 Public module variables:
33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	4
49804 8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	5 whitespace -- a string containing all ASCII whitespace
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	6 ascii_lowercase -- a string containing all ASCII lowercase letters
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	7 ascii_uppercase -- a string containing all ASCII uppercase letters
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	8 ascii_letters -- a string containing all ASCII letters
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	9 digits -- a string containing all ASCII decimal digits
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	10 hexdigits -- a string containing all ASCII hexadecimal digits
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	11 octdigits -- a string containing all ASCII octal digits
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	12 punctuation -- a string containing all ASCII punctuation characters
8f0a175f04be #4361: fix string.py docstring, clarify that only ASCII characters are in its constants. Georg Brandl <georg@python.org> parents: 49734 diff changeset	13 printable -- a string containing all ASCII characters considered printable
6964 33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	14
33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	15 """
33be7d5d498b Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6821 diff changeset	16
5 5570dbb1ce55 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 # Some strings for ctype-style character classification
1331 07900834cc97 * pdb.py: set 'privileged' property when evaluating expressions Guido van Rossum <guido@python.org> parents: 1291 diff changeset	18 whitespace = ' \t\n\r\v\f'
42585 b623777f22b0 Remove string.{letters,lowercase,uppercase}. Martin v. Löwis <martin@v.loewis.de> parents: 42142 diff changeset	19 ascii_lowercase = 'abcdefghijklmnopqrstuvwxyz'
b623777f22b0 Remove string.{letters,lowercase,uppercase}. Martin v. Löwis <martin@v.loewis.de> parents: 42142 diff changeset	20 ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
18776 22b2f4b436af Added the constants ascii_letters, ascii_lowercase, and ascii_uppercase Fred Drake <fdrake@acm.org> parents: 16657 diff changeset	21 ascii_letters = ascii_lowercase + ascii_uppercase
5 5570dbb1ce55 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	22 digits = '0123456789'
5570dbb1ce55 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	23 hexdigits = digits + 'abcdef' + 'ABCDEF'
5570dbb1ce55 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24 octdigits = '01234567'
15872 3685ef2a55a4 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15610 diff changeset	25 punctuation = """!"#$%&'()*+,-./:;<=>?@[\]^_`{\|}~"""
42585 b623777f22b0 Remove string.{letters,lowercase,uppercase}. Martin v. Löwis <martin@v.loewis.de> parents: 42142 diff changeset	26 printable = digits + ascii_letters + punctuation + whitespace
5 5570dbb1ce55 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	27
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	28 # Functions which aren't available as string methods.
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	29
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	30 # Capitalize the words in a string, e.g. " aBc dEf " -> "Abc Def".
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	31 def capwords(s, sep=None):
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	32 """capwords(s, [sep]) -> string
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	33
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	34 Split the argument into words using split, capitalize each
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	35 word using capitalize, and join the capitalized words using
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	36 join. Note that this replaces runs of whitespace characters by
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	37 a single space.
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	38
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	39 """
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	40 return (sep or ' ').join([x.capitalize() for x in s.split(sep)])
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	41
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	42
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	43 # Construct a translation map for bytes.translate
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43241 diff changeset	44 def maketrans(frm: bytes, to: bytes) -> bytes:
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	45 """maketrans(frm, to) -> bytes
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	46
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	47 Return a translation table (a bytes object of length 256)
5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	48 suitable for use in bytes.translate where each byte in frm is
5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	49 mapped to the byte at the same position in to.
5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	50 The strings frm and to must be of the same length.
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	51 """
53094 4407e4d07084 Add bytes/bytearray.maketrans() to mirror str.maketrans(), and deprecate Georg Brandl <georg@python.org> parents: 49804 diff changeset	52 import warnings
4407e4d07084 Add bytes/bytearray.maketrans() to mirror str.maketrans(), and deprecate Georg Brandl <georg@python.org> parents: 49804 diff changeset	53 warnings.warn("string.maketrans is deprecated, use bytes.maketrans instead",
53909 238502460795 #4351: more appropriate DeprecationWarning stacklevels Philip Jenvey <pjenvey@underboss.org> parents: 53094 diff changeset	54 DeprecationWarning, 2)
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	55 if len(frm) != len(to):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43016 diff changeset	56 raise ValueError("maketrans arguments must have same length")
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	57 if not (isinstance(frm, bytes) and isinstance(to, bytes)):
5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	58 raise TypeError("maketrans arguments must be bytes objects")
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	59 L = bytearray(range(256))
43144 5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	60 for i, c in enumerate(frm):
5c30f15a6b87 string.maketrans() now produces translation tables for bytes.translate() -- wrong module? Georg Brandl <georg@python.org> parents: 43112 diff changeset	61 L[c] = to[i]
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43241 diff changeset	62 return bytes(L)
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	63
34127 4dcd78f3b5d1 Remove outdated references to the regsub module. Raymond Hettinger <python@rcn.com> parents: 33871 diff changeset	64
33278 2b136441035c Minor improvements to the template code. Raymond Hettinger <python@rcn.com> parents: 33257 diff changeset	65 ####################################################################
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	66 import re as _re
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	67
33471 41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	68 class _multimap:
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	69 """Helper class for combining multiple mappings.
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	70
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	71 Used by .{safe_,}substitute() to combine the mapping and keyword
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	72 arguments.
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	73 """
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	74 def __init__(self, primary, secondary):
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	75 self._primary = primary
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	76 self._secondary = secondary
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	77
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	78 def __getitem__(self, key):
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	79 try:
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	80 return self._primary[key]
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	81 except KeyError:
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	82 return self._secondary[key]
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	83
41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	84
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	85 class _TemplateMetaclass(type):
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	86 pattern = r"""
33588 68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	87 %(delim)s(?:
68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	88 (?P<escaped>%(delim)s) \| # Escape sequence of two delimiters
68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	89 (?P<named>%(id)s) \| # delimiter and a Python identifier
68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	90 {(?P<braced>%(id)s)} \| # delimiter and a braced identifier
68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	91 (?P<invalid>) # Other ill-formed delimiter exprs
68d11e439a0b Make the regex pattern easier to read, understand, and modify Raymond Hettinger <python@rcn.com> parents: 33505 diff changeset	92 )
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	93 """
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	94
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	95 def __init__(cls, name, bases, dct):
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	96 super(_TemplateMetaclass, cls).__init__(name, bases, dct)
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	97 if 'pattern' in dct:
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	98 pattern = cls.pattern
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	99 else:
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	100 pattern = _TemplateMetaclass.pattern % {
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	101 'delim' : _re.escape(cls.delimiter),
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	102 'id' : cls.idpattern,
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	103 }
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	104 cls.pattern = _re.compile(pattern, _re.IGNORECASE \| _re.VERBOSE)
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	105
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	106
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	107 class Template(metaclass=_TemplateMetaclass):
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	108 """A string class for supporting $-substitutions."""
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	109
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	110 delimiter = '$'
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	111 idpattern = r'[_a-z][_a-z0-9]*'
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	112
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	113 def __init__(self, template):
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	114 self.template = template
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	115
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	116 # Search for $$, $identifier, ${identifier}, and any bare $'s
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	117
33479 b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	118 def _invalid(self, mo):
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	119 i = mo.start('invalid')
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	120 lines = self.template[:i].splitlines(True)
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	121 if not lines:
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	122 colno = 1
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	123 lineno = 1
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	124 else:
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	125 colno = i - len(''.join(lines[:-1]))
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	126 lineno = len(lines)
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	127 raise ValueError('Invalid placeholder in string: line %d, col %d' %
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	128 (lineno, colno))
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	129
33477 a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	130 def substitute(self, args, *kws):
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	131 if len(args) > 1:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	132 raise TypeError('Too many positional arguments')
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	133 if not args:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	134 mapping = kws
33471 41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	135 elif kws:
33477 a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	136 mapping = _multimap(kws, args[0])
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	137 else:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	138 mapping = args[0]
33471 41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	139 # Helper function for .sub()
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	140 def convert(mo):
33479 b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	141 # Check the most common path first.
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	142 named = mo.group('named') or mo.group('braced')
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	143 if named is not None:
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	144 val = mapping[named]
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	145 # We use this idiom instead of str() because the latter will
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	146 # fail if val is a Unicode containing non-ASCII characters.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 34127 diff changeset	147 return '%s' % (val,)
33278 2b136441035c Minor improvements to the template code. Raymond Hettinger <python@rcn.com> parents: 33257 diff changeset	148 if mo.group('escaped') is not None:
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	149 return self.delimiter
33479 b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	150 if mo.group('invalid') is not None:
b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	151 self._invalid(mo)
33773 ab09daac5691 Invalid patterns to substitute and safe_substitute would crash since pattern Neal Norwitz <nnorwitz@gmail.com> parents: 33588 diff changeset	152 raise ValueError('Unrecognized named group in pattern',
ab09daac5691 Invalid patterns to substitute and safe_substitute would crash since pattern Neal Norwitz <nnorwitz@gmail.com> parents: 33588 diff changeset	153 self.pattern)
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	154 return self.pattern.sub(convert, self.template)
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	155
33477 a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	156 def safe_substitute(self, args, *kws):
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	157 if len(args) > 1:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	158 raise TypeError('Too many positional arguments')
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	159 if not args:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	160 mapping = kws
33471 41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	161 elif kws:
33477 a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	162 mapping = _multimap(kws, args[0])
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	163 else:
a220073536d6 substitute(), safe_substitute(): Paul Moore provides a better hack for dealing Barry Warsaw <barry@python.org> parents: 33471 diff changeset	164 mapping = args[0]
33471 41dbee5ed295 Accepted Raymond's patch to combine mapping and keyword arguments, with slight Barry Warsaw <barry@python.org> parents: 33450 diff changeset	165 # Helper function for .sub()
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	166 def convert(mo):
33278 2b136441035c Minor improvements to the template code. Raymond Hettinger <python@rcn.com> parents: 33257 diff changeset	167 named = mo.group('named')
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	168 if named is not None:
11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	169 try:
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	170 # We use this idiom instead of str() because the latter
629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	171 # will fail if val is a Unicode containing non-ASCII
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 34127 diff changeset	172 return '%s' % (mapping[named],)
33257 11a4fbc88a80 PEP 292 classes Template and SafeTemplate are added to the string module. Barry Warsaw <barry@python.org> parents: 31199 diff changeset	173 except KeyError:
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	174 return self.delimiter + named
33278 2b136441035c Minor improvements to the template code. Raymond Hettinger <python@rcn.com> parents: 33257 diff changeset	175 braced = mo.group('braced')
33482 2623668c5ff5 Fix small bugs in Template code. Raymond Hettinger <python@rcn.com> parents: 33479 diff changeset	176 if braced is not None:
2623668c5ff5 Fix small bugs in Template code. Raymond Hettinger <python@rcn.com> parents: 33479 diff changeset	177 try:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 34127 diff changeset	178 return '%s' % (mapping[braced],)
33482 2623668c5ff5 Fix small bugs in Template code. Raymond Hettinger <python@rcn.com> parents: 33479 diff changeset	179 except KeyError:
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	180 return self.delimiter + '{' + braced + '}'
33479 b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	181 if mo.group('escaped') is not None:
33505 cc0ae03743b8 At the cost of a modest (but useful in its own right) change in the semantics Barry Warsaw <barry@python.org> parents: 33497 diff changeset	182 return self.delimiter
33479 b87eaa46c9cb Raymond's good suggestion to re-order the tests in the convert() helper so the Barry Warsaw <barry@python.org> parents: 33477 diff changeset	183 if mo.group('invalid') is not None:
33871 5afa5277fcd9 SF patch #1056967, changes the semantics of Template.safe_substitute() to not Barry Warsaw <barry@python.org> parents: 33773 diff changeset	184 return self.delimiter
33773 ab09daac5691 Invalid patterns to substitute and safe_substitute would crash since pattern Neal Norwitz <nnorwitz@gmail.com> parents: 33588 diff changeset	185 raise ValueError('Unrecognized named group in pattern',
ab09daac5691 Invalid patterns to substitute and safe_substitute would crash since pattern Neal Norwitz <nnorwitz@gmail.com> parents: 33588 diff changeset	186 self.pattern)
33439 629200d880ea Many updates to PEP 292 templates. Summary: Barry Warsaw <barry@python.org> parents: 33278 diff changeset	187 return self.pattern.sub(convert, self.template)
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	188
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	189
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	190
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	191 ########################################################################
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	192 # the Formatter class
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	193 # see PEP 3101 for details and purpose of this class
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	194
49734 b0fcb17f7efa Merged revisions 67154,67157-67159,67175-67176,67189,67224-67227,67234 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 43947 diff changeset	195 # The hard parts are reused from the C implementation. They're exposed as "_"
b0fcb17f7efa Merged revisions 67154,67157-67159,67175-67176,67189,67224-67227,67234 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 43947 diff changeset	196 # prefixed methods of str and unicode.
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	197
42896 7bf8f2339ec6 PEP 3101: Removed _formatter_xxx routines from sysmodule, and made them unicode methods instead (per GvR suggestion). Eric Smith <eric@trueblade.com> parents: 42875 diff changeset	198 # The overall parser is implemented in str._formatter_parser.
7bf8f2339ec6 PEP 3101: Removed _formatter_xxx routines from sysmodule, and made them unicode methods instead (per GvR suggestion). Eric Smith <eric@trueblade.com> parents: 42875 diff changeset	199 # The field name parser is implemented in str._formatter_field_name_split
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	200
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	201 class Formatter:
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	202 def format(self, format_string, args, *kwargs):
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	203 return self.vformat(format_string, args, kwargs)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	204
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	205 def vformat(self, format_string, args, kwargs):
43112 90c715bc7d30 Changed signature of string.Formatter.get_field, per suggestion by Eric Smith <eric@trueblade.com> parents: 43020 diff changeset	206 used_args = set()
43241 e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	207 result = self._vformat(format_string, args, kwargs, used_args, 2)
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	208 self.check_unused_args(used_args, args, kwargs)
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	209 return result
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	210
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	211 def _vformat(self, format_string, args, kwargs, used_args, recursion_depth):
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	212 if recursion_depth < 0:
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	213 raise ValueError('Max string recursion exceeded')
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	214 result = []
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	215 for literal_text, field_name, format_spec, conversion in \
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	216 self.parse(format_string):
42969 0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	217
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	218 # output the literal text
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	219 if literal_text:
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	220 result.append(literal_text)
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	221
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	222 # if there's a field, output it
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	223 if field_name is not None:
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	224 # this is some markup, find the object and do
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	225 # the formatting
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	226
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	227 # given the field_name, find the object it references
43112 90c715bc7d30 Changed signature of string.Formatter.get_field, per suggestion by Eric Smith <eric@trueblade.com> parents: 43020 diff changeset	228 # and the argument it came from
43200 463b341a9d63 Removed used_args param from string.Formatter.get_field. It was left in by mistake from an earlier edit. Eric Smith <eric@trueblade.com> parents: 43144 diff changeset	229 obj, arg_used = self.get_field(field_name, args, kwargs)
43112 90c715bc7d30 Changed signature of string.Formatter.get_field, per suggestion by Eric Smith <eric@trueblade.com> parents: 43020 diff changeset	230 used_args.add(arg_used)
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	231
5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	232 # do any conversion on the resulting object
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	233 obj = self.convert_field(obj, conversion)
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	234
43241 e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	235 # expand the format spec, if needed
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	236 format_spec = self._vformat(format_spec, args, kwargs,
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	237 used_args, recursion_depth-1)
e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	238
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	239 # format the object and append to the result
5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	240 result.append(self.format_field(obj, format_spec))
42969 0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	241
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	242 return ''.join(result)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	243
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	244
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	245 def get_value(self, key, args, kwargs):
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	246 if isinstance(key, int):
5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	247 return args[key]
5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	248 else:
5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	249 return kwargs[key]
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	250
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	251
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	252 def check_unused_args(self, used_args, args, kwargs):
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	253 pass
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	254
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	255
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42585 diff changeset	256 def format_field(self, value, format_spec):
42875 5fd65e250843 PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation. Eric Smith <eric@trueblade.com> parents: 42817 diff changeset	257 return format(value, format_spec)
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	258
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	259
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	260 def convert_field(self, value, conversion):
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	261 # do any conversion on the resulting object
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	262 if conversion == 'r':
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	263 return repr(value)
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	264 elif conversion == 's':
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	265 return str(value)
43241 e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	266 elif conversion is None:
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	267 return value
43241 e946073dee38 Changed some ValueError's to KeyError and IndexError. Eric Smith <eric@trueblade.com> parents: 43200 diff changeset	268 raise ValueError("Unknown converion specifier {0!s}".format(conversion))
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	269
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	270
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	271 # returns an iterable that contains tuples of the form:
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	272 # (literal_text, field_name, format_spec, conversion)
42969 0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	273 # literal_text can be zero length
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	274 # field_name can be None, in which case there's no
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	275 # object to format and output
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	276 # if field_name is not None, it is looked up, formatted
0e510aff5e9a Modified parsing of format strings, so that we always return Eric Smith <eric@trueblade.com> parents: 42948 diff changeset	277 # with format_spec and conversion and then used
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	278 def parse(self, format_string):
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	279 return format_string._formatter_parser()
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	280
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	281
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	282 # given a field_name, find the object it references.
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	283 # field_name: the field being looked up, e.g. "0.name"
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	284 # or "lookup[3]"
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	285 # used_args: a set of which args have been used
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	286 # args, kwargs: as passed in to vformat
43200 463b341a9d63 Removed used_args param from string.Formatter.get_field. It was left in by mistake from an earlier edit. Eric Smith <eric@trueblade.com> parents: 43144 diff changeset	287 def get_field(self, field_name, args, kwargs):
42948 4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	288 first, rest = field_name._formatter_field_name_split()
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	289
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	290 obj = self.get_value(first, args, kwargs)
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	291
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	292 # loop through the rest of the field_name, doing
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	293 # getattr or getitem as needed
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	294 for is_attr, i in rest:
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	295 if is_attr:
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	296 obj = getattr(obj, i)
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	297 else:
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	298 obj = obj[i]
4ecbae07481f Simplified tuple returned by string._formatter_parser to only have Eric Smith <eric@trueblade.com> parents: 42896 diff changeset	299
43112 90c715bc7d30 Changed signature of string.Formatter.get_field, per suggestion by Eric Smith <eric@trueblade.com> parents: 43020 diff changeset	300 return obj, first

Mercurial > cpython-lru_cache-weakref

annotate Lib/string.py @ 56121:ea697cde6882 3.1