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

Merge #13579: teach string.Formatter about 'a'.

Sun, 19 Aug 2012 17:45:40 -0400

Merge #13579: teach string.Formatter about 'a'.

Patch by Francisco Martín Brugué.

#13012: use splitlines(keepends=True/False) instead of splitlines(0/1).

Wed, 28 Sep 2011 17:37:55 +0300

#13012: use splitlines(keepends=True/False) instead of splitlines(0/1).

Dummy-merge 3.2 branch into default branch.

Sat, 05 Mar 2011 15:16:28 +0100

Dummy-merge 3.2 branch into default branch.

Issue #11297: Add collections.ChainMap()

Sat, 26 Feb 2011 01:02:51 +0000

Issue #11297: Add collections.ChainMap()

Factor-out common code for helper classes.

Tue, 22 Feb 2011 01:55:36 +0000

Factor-out common code for helper classes.

#13579: teach string.Formatter about 'a'.

Sun, 19 Aug 2012 17:26:34 -0400

#13579: teach string.Formatter about 'a'.

Patch by Francisco Martín Brugué.

Dummy-merge 3.1 branch into 3.2 branch.

Sat, 05 Mar 2011 15:15:55 +0100

Dummy-merge 3.1 branch into 3.2 branch.

#9418: first step of moving private string methods to _string module.

Thu, 14 Oct 2010 07:04:07 +0000

#9418: first step of moving private string methods to _string module.

Issue #1686: Fix string.Template when overriding the pattern attribute.

Sat, 18 Sep 2010 23:34:07 +0000

Issue #1686: Fix string.Template when overriding the pattern attribute.

typo

Mon, 06 Sep 2010 20:27:55 +0000

typo

#6630: allow customizing flags for compiling string.Template.idpattern.

Thu, 29 Jul 2010 17:16:10 +0000

#6630: allow customizing flags for compiling string.Template.idpattern.

Merged revisions 75070 via svnmerge from

Sat, 26 Sep 2009 12:33:22 +0000

Merged revisions 75070 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
r75070 | ezio.melotti | 2009-09-26 14:20:53 +0300 (Sat, 26 Sep 2009) | 1 line

#7000: document "sep" in capwords. Add a few tests
........

remove string.maketrans

Sun, 28 Jun 2009 21:35:31 +0000

remove string.maketrans

Merged revisions 75074 via svnmerge from

Sat, 26 Sep 2009 12:35:01 +0000

Merged revisions 75074 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
r75074 | ezio.melotti | 2009-09-26 15:33:22 +0300 (Sat, 26 Sep 2009) | 9 lines

Merged revisions 75070 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
r75070 | ezio.melotti | 2009-09-26 14:20:53 +0300 (Sat, 26 Sep 2009) | 1 line

#7000: document "sep" in capwords. Add a few tests
........
................

#4351: more appropriate DeprecationWarning stacklevels

Fri, 08 May 2009 03:57:12 +0000

#4351: more appropriate DeprecationWarning stacklevels

Add bytes/bytearray.maketrans() to mirror str.maketrans(), and deprecate

Sun, 12 Apr 2009 15:51:51 +0000

Add bytes/bytearray.maketrans() to mirror str.maketrans(), and deprecate
string.maketrans() which actually works on bytes. (Also closes #5675.)

#4361: fix string.py docstring, clarify that only ASCII characters are in its constants.

Sat, 22 Nov 2008 08:31:09 +0000

#4361: fix string.py docstring, clarify that only ASCII characters are in its constants.

Merged revisions 67154,67157-67159,67175-67176,67189,67224-67227,67234 via svnmerge from

Sun, 16 Nov 2008 18:33:53 +0000

Merged revisions 67154,67157-67159,67175-67176,67189,67224-67227,67234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
r67154 | hirokazu.yamamoto | 2008-11-07 21:46:17 -0600 (Fri, 07 Nov 2008) | 1 line

Issue #4071: ntpath.abspath returned an empty string for long unicode path.
........
r67157 | georg.brandl | 2008-11-08 05:47:44 -0600 (Sat, 08 Nov 2008) | 2 lines

Don't use "HOWTO" as the title for all howto .tex files.
........
r67158 | georg.brandl | 2008-11-08 05:48:20 -0600 (Sat, 08 Nov 2008) | 2 lines

Update "Documenting" a bit. Concentrate on Python-specifics.
........
r67159 | georg.brandl | 2008-11-08 06:52:25 -0600 (Sat, 08 Nov 2008) | 2 lines

Fix warning.
........
r67175 | benjamin.peterson | 2008-11-08 19:44:32 -0600 (Sat, 08 Nov 2008) | 1 line

update link
........
r67176 | benjamin.peterson | 2008-11-08 19:52:32 -0600 (Sat, 08 Nov 2008) | 1 line

fix comment
........
r67189 | benjamin.peterson | 2008-11-11 15:56:06 -0600 (Tue, 11 Nov 2008) | 1 line

use correct name
........
r67224 | georg.brandl | 2008-11-15 02:10:04 -0600 (Sat, 15 Nov 2008) | 2 lines

#4324: fix getlocale() argument.
........
r67225 | brett.cannon | 2008-11-15 16:33:25 -0600 (Sat, 15 Nov 2008) | 1 line

Clarify the docs for the 'strict' argument to httplib.HTTPConnection.
........
r67226 | brett.cannon | 2008-11-15 16:40:44 -0600 (Sat, 15 Nov 2008) | 4 lines

The docs for httplib.HTTPConnection.putheader() have claimed for quite a while
that their could be an arbitrary number of values passed in. Turns out the code
did not match that. The code now matches the docs.
........
r67227 | georg.brandl | 2008-11-16 02:00:17 -0600 (Sun, 16 Nov 2008) | 2 lines

#4316: fix configure.in markup problem.
........
r67234 | benjamin.peterson | 2008-11-16 11:54:55 -0600 (Sun, 16 Nov 2008) | 1 line

run autoconf
........

Rename buffer -> bytearray.

Wed, 21 Nov 2007 19:29:53 +0000

Rename buffer -> bytearray.

Merging the py3k-pep3137 branch back into the py3k branch.

Tue, 06 Nov 2007 21:34:58 +0000

Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137
branch. The most obvious changes:

- str8 renamed to bytes (PyString at the C level);
- bytes renamed to buffer (PyBytes at the C level);
- PyString and PyUnicode are no longer compatible.

I.e. we now have an immutable bytes type and a mutable bytes type.

The behavior of PyString was modified quite a bit, to make it more
bytes-like. Some changes are still on the to-do list.

Changed some ValueError's to KeyError and IndexError.

Tue, 04 Sep 2007 23:04:22 +0000

Changed some ValueError's to KeyError and IndexError.
Corrected code for invalid conversion specifier.
Added tests to verify.

Modified string.Formatter to correctly expand format_spec's,
and added a limit to recursion depth. Added _vformat()
method to support both of these.

Removed used_args param from string.Formatter.get_field. It was left in by mistake from an earlier edit.

Sun, 02 Sep 2007 15:33:26 +0000

Removed used_args param from string.Formatter.get_field. It was left in by mistake from an earlier edit.

string.maketrans() now produces translation tables for bytes.translate() -- wrong module?

Fri, 31 Aug 2007 10:37:15 +0000

string.maketrans() now produces translation tables for bytes.translate() -- wrong module?
Fix all remaining instances that did bad things with the new str.translate().

Changed signature of string.Formatter.get_field, per suggestion by

Fri, 31 Aug 2007 02:26:31 +0000

Changed signature of string.Formatter.get_field, per suggestion by
Ron Adam.

Added test case for using all parameters in string.Formatter.

Raise statement normalization in Lib/.

Thu, 30 Aug 2007 01:19:48 +0000

Raise statement normalization in Lib/.

Revert r57685 (weird merge result).

Wed, 29 Aug 2007 23:41:34 +0000

Revert r57685 (weird merge result).

Wed, 29 Aug 2007 23:37:10 +0000

(none)

Modified parsing of format strings, so that we always return

Wed, 29 Aug 2007 03:22:59 +0000

Modified parsing of format strings, so that we always return
a tuple (literal, field_name, format_spec, conversion).

literal will always be a string, but might be of zero length.
field_name will be None if there is no markup text
format_spec will be a (possibly zero length) string if
field_name is non-None
conversion will be a one character string, or None

This makes the Formatter class, and especially it's parse()
method, easier to understand.

Suggestion was by Jim Jewett, inspired by the "tail" of an
elementtree node.

Also, fixed a reference leak in fieldnameiter_next.

Simplified tuple returned by string._formatter_parser to only have

Tue, 28 Aug 2007 11:15:20 +0000

Simplified tuple returned by string._formatter_parser to only have
4 elements. No need for old is_markup element, the same information
is indicated by literal_string being None.

Factored string.Formatter class to make subclasses easier to write.

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

Mon, 27 Aug 2007 11:28:18 +0000

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

PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation.

Sun, 26 Aug 2007 22:27:13 +0000

PEP 3101: Completed string.Formatter class. Reimplemented field_name to object transformation.

Implementation of PEP 3101, Advanced String Formatting.

Sat, 25 Aug 2007 02:26:07 +0000

Implementation of PEP 3101, Advanced String Formatting.

Known issues:

The string.Formatter class, as discussed in the PEP, is incomplete.

Error handling needs to conform to the PEP.

Need to fix this warning that I introduced in Python/formatter_unicode.c:
Objects/stringlib/unicodedefs.h:26: warning: `STRINGLIB_CMP' defined but not used

Need to make sure sign formatting is correct, more tests needed.

Need to remove '()' sign formatting, left over from an earlier version of the PEP.

Remove string.{letters,lowercase,uppercase}.

Tue, 14 Aug 2007 09:23:10 +0000

Remove string.{letters,lowercase,uppercase}.

Merged revisions 56125-56153 via svnmerge from

Tue, 03 Jul 2007 08:25:58 +0000

Merged revisions 56125-56153 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
r56127 | georg.brandl | 2007-06-30 09:32:49 +0200 (Sat, 30 Jun 2007) | 2 lines

Fix a place where floor division would be in order.
........
r56135 | guido.van.rossum | 2007-07-01 06:13:54 +0200 (Sun, 01 Jul 2007) | 28 lines

Make map() and filter() identical to itertools.imap() and .ifilter(),
respectively.

I fixed two bootstrap issues, due to the dynamic import of itertools:

1. Starting python requires that map() and filter() are not used until
site.py has added build/lib. to sys.path.
2. Building python requires that setup.py and distutils and everything
they use is free of map() and filter() calls.

Beyond this, I only fixed the tests in test_builtin.py.
Others, please help fixing the remaining tests that are now broken!
The fixes are usually simple:
a. map(None, X) -> list(X)
b. map(F, X) -> list(map(F, X))
c. map(lambda x: F(x), X) -> [F(x) for x in X]
d. filter(F, X) -> list(filter(F, X))
e. filter(lambda x: P(x), X) -> [x for x in X if P(x)]

Someone, please also contribute a fixer for 2to3 to do this.
It can leave map()/filter() calls alone that are already
inside a list() or sorted() call or for-loop.

Only in rare cases have I seen code that depends on map() of lists
of different lengths going to the end of the longest, or on filter()
of a string or tuple returning an object of the same type; these
will need more thought to fix.
........
r56136 | guido.van.rossum | 2007-07-01 06:22:01 +0200 (Sun, 01 Jul 2007) | 3 lines

Make it so that test_decimal fails instead of hangs, to help automated
test runners.
........
r56139 | georg.brandl | 2007-07-01 18:20:58 +0200 (Sun, 01 Jul 2007) | 2 lines

Fix a few test cases after the map->imap change.
........
r56142 | neal.norwitz | 2007-07-02 06:38:12 +0200 (Mon, 02 Jul 2007) | 1 line

Get a bunch more tests passing after converting map/filter to return iterators.
........
r56147 | guido.van.rossum | 2007-07-02 15:32:02 +0200 (Mon, 02 Jul 2007) | 4 lines

Fix the remaining failing unit tests (at least on OSX).
Also tweaked urllib2 so it doesn't raise socket.gaierror when
all network interfaces are turned off.
........

Merged revisions 55342-55406 via svnmerge from

Thu, 17 May 2007 18:20:34 +0000

Merged revisions 55342-55406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
r55360 | guido.van.rossum | 2007-05-15 14:57:59 -0700 (Tue, 15 May 2007) | 2 lines

obcheckin.
........
r55361 | guido.van.rossum | 2007-05-15 14:59:18 -0700 (Tue, 15 May 2007) | 2 lines

Get rid of strop module.
........
r55367 | brett.cannon | 2007-05-15 21:06:28 -0700 (Tue, 15 May 2007) | 2 lines

Remove the 'pure' module.
........
r55369 | brett.cannon | 2007-05-15 21:07:31 -0700 (Tue, 15 May 2007) | 2 lines

Remove the lib-old directory (already empty).
........
r55370 | neal.norwitz | 2007-05-15 21:30:40 -0700 (Tue, 15 May 2007) | 1 line

Get rid of a bunch more references to strop
........
r55374 | brett.cannon | 2007-05-15 21:39:00 -0700 (Tue, 15 May 2007) | 2 lines

Complete the removal of IRIX-specific modules.
........
r55379 | brett.cannon | 2007-05-15 22:31:54 -0700 (Tue, 15 May 2007) | 2 lines

Update removed IRIX modules based on what is gone from removing plat-irix6.
........
r55388 | brett.cannon | 2007-05-16 14:34:52 -0700 (Wed, 16 May 2007) | 2 lines

Clean up the docstring for the compiler resource.
........
r55406 | brett.cannon | 2007-05-17 11:05:37 -0700 (Thu, 17 May 2007) | 2 lines

Remove BaseException.message (deprecated in Python 2.6).
........

Merged revisions 55007-55179 via svnmerge from

Mon, 07 May 2007 22:24:25 +0000

Merged revisions 55007-55179 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
r55077 | guido.van.rossum | 2007-05-02 11:54:37 -0700 (Wed, 02 May 2007) | 2 lines

Use the new print syntax, at least.
........
r55142 | fred.drake | 2007-05-04 21:27:30 -0700 (Fri, 04 May 2007) | 1 line

remove old cruftiness
........
r55143 | fred.drake | 2007-05-04 21:52:16 -0700 (Fri, 04 May 2007) | 1 line

make this work with the new Python
........
r55162 | neal.norwitz | 2007-05-06 22:29:18 -0700 (Sun, 06 May 2007) | 1 line

Get asdl code gen working with Python 2.3. Should continue to work with 3.0
........
r55164 | neal.norwitz | 2007-05-07 00:00:38 -0700 (Mon, 07 May 2007) | 1 line

Verify checkins to p3yk (sic) branch go to 3000 list.
........
r55166 | neal.norwitz | 2007-05-07 00:12:35 -0700 (Mon, 07 May 2007) | 1 line

Fix this test so it runs again by importing warnings_test properly.
........
r55167 | neal.norwitz | 2007-05-07 01:03:22 -0700 (Mon, 07 May 2007) | 8 lines

So long xrange. range() now supports values that are outside
-sys.maxint to sys.maxint. floats raise a TypeError.

This has been sitting for a long time. It probably has some problems and
needs cleanup. Objects/rangeobject.c now uses 4-space indents since
it is almost completely new.
........
r55171 | guido.van.rossum | 2007-05-07 10:21:26 -0700 (Mon, 07 May 2007) | 4 lines

Fix two tests that were previously depending on significant spaces
at the end of a line (and before that on Python 2.x print behavior
that has no exact equivalent in 3.0).
........

Remove functions in string module that are also string methods. Also remove:

Tue, 17 Apr 2007 08:48:32 +0000

Remove functions in string module that are also string methods. Also remove:
* all calls to functions in the string module (except maketrans)
* everything from stropmodule except for maketrans() which is still used

Implement PEP 3115 -- new metaclass syntax and semantics.

Sun, 18 Mar 2007 15:41:51 +0000

Implement PEP 3115 -- new metaclass syntax and semantics.
The compiler package hasn't been updated yet; test_compiler.py fails.
Otherwise all tests seem to be passing now. There are no occurrences
of __metaclass__ left in the standard library.
Docs have not been updated.

Rip out 'long' and 'L'-suffixed integer literals.

Mon, 15 Jan 2007 16:59:06 +0000

Rip out 'long' and 'L'-suffixed integer literals.
(Rough first cut.)

Cookie.py shouldn't "bogusly" use string._idmap.

Mon, 14 Aug 2006 22:01:24 +0000

Cookie.py shouldn't "bogusly" use string._idmap.

Fix bug in passing tuples to string.Template. All other values (with working

Wed, 05 Jul 2006 11:03:49 +0000

Fix bug in passing tuples to string.Template. All other values (with working
str() or repr()) would work, just not multi-value tuples. Probably not a
backport candidate, since it changes the behaviour of passing a
single-element tuple:

>>> string.Template("$foo").substitute(dict(foo=(1,)))

'(1,)'

versus

'1'

Remove outdated references to the regsub module.

Tue, 07 Dec 2004 07:55:07 +0000

Remove outdated references to the regsub module.

SF patch #1056967, changes the semantics of Template.safe_substitute() to not

Mon, 01 Nov 2004 03:52:43 +0000

SF patch #1056967, changes the semantics of Template.safe_substitute() to not
raise a ValueError for dangling delimiters (the delimiter itself is returned).

Invalid patterns to substitute and safe_substitute would crash since pattern

Sun, 17 Oct 2004 16:27:18 +0000

Invalid patterns to substitute and safe_substitute would crash since pattern
is not a local variable. Add a test case.

Make the regex pattern easier to read, understand, and modify

Sun, 26 Sep 2004 18:56:44 +0000

Make the regex pattern easier to read, understand, and modify
by factoring out the common prefix (the delimiter).

At the cost of a modest (but useful in its own right) change in the semantics

Sat, 18 Sep 2004 00:06:34 +0000

At the cost of a modest (but useful in its own right) change in the semantics
of the Template.delimiter attribute, we make use of the delimiter in the
escaped group, and in the safe_substitute() method more robust.

Now, .delimiter should be the unescaped delimiter literal, e.g. '$' or '&', or
whatever. The _TemplateMetaclass will re.escape() this value when it builds
the pattern.

Whitespace normalization.

Thu, 16 Sep 2004 00:09:19 +0000

Whitespace normalization.

Make the hint about the None default less ambiguous.

Tue, 14 Sep 2004 09:45:10 +0000

Make the hint about the None default less ambiguous.

Enhance the docstrings for unicode.split() and string.split()

Tue, 14 Sep 2004 09:40:45 +0000

Enhance the docstrings for unicode.split() and string.split()
to make it clear that it is possible to pass None as the
separator argument to get the default "any whitespace" separator.

Fix small bugs in Template code.

Tue, 14 Sep 2004 02:34:08 +0000

Fix small bugs in Template code.

* The parameterization of "delimiter" was incomplete.
* safe_substitute's code for braced delimiters should only be executed
when braced is not None.
* Invalid pattern group names now raise a ValueError. Formerly, the
convert code would fall off the end and improperly return None.

Beefed-up tests.

* Test delimiter override for all paths in substitute and safe_substitute.
* Alter unittest invocation to match other modules (now it itemizes the
tests as they are run).

Raymond's good suggestion to re-order the tests in the convert() helper so the

Mon, 13 Sep 2004 20:52:50 +0000

Raymond's good suggestion to re-order the tests in the convert() helper so the
most common paths are tested first. Also, that 'invalid' is better than
'bogus'.

substitute(), safe_substitute(): Paul Moore provides a better hack for dealing

Mon, 13 Sep 2004 15:25:15 +0000

substitute(), safe_substitute(): Paul Moore provides a better hack for dealing
with positional arguments.

Accepted Raymond's patch to combine mapping and keyword arguments, with slight

Mon, 13 Sep 2004 14:35:04 +0000

Accepted Raymond's patch to combine mapping and keyword arguments, with slight
modification. Also, renamed the positional argument to '__mapping' to further
reduce the chance of duplicate keyword arguments.

Template: remove slots since that interferes with the ability to mix in

Fri, 10 Sep 2004 18:30:42 +0000

Template: remove __slots__ since that interferes with the ability to mix in
Template and unicode classes.

slots went missing from Template.

Fri, 10 Sep 2004 06:21:22 +0000

__slots__ went missing from Template.

Many updates to PEP 292 templates. Summary:

Fri, 10 Sep 2004 03:08:08 +0000

Many updates to PEP 292 templates. Summary:

- Template no longer inherits from unicode.

- SafeTemplate is removed. Now Templates have both a substitute() and a
safe_substitute() method, so we don't need separate classes. No more
__mod__() operator.

- Adopt Tim Peter's idea for giving Template a metaclass, which makes the
delimiter, the identifier pattern, or the entire pattern easy to override
and document, while retaining efficiency of class-time compilation of the
regexp.

- More informative ValueError messages which will help a user narrow down the
bogus delimiter to the line and column in the original string (helpful for
long triple quoted strings).

Minor improvements to the template code.

Thu, 26 Aug 2004 00:21:13 +0000

Minor improvements to the template code.

* Add comment bars segregating this code from the rest.
* Improve readability of the re pattern with indentation and comments on
the same line.
* Replace the groupdict() and get() pair with a direct call to group()
which does the same thing.

PEP 292 classes Template and SafeTemplate are added to the string module.

Wed, 25 Aug 2004 02:22:30 +0000

PEP 292 classes Template and SafeTemplate are added to the string module.
This patch includes test cases and documentation updates, as well as NEWS file
updates.

This patch also updates the sre modules so that they don't import the string
module, breaking direct circular imports.

Add rsplit method for str and unicode builtin types.

Mon, 15 Dec 2003 18:49:53 +0000

Add rsplit method for str and unicode builtin types.

SF feature request #801847.
Original patch is written by Sean Reifschneider.

Add optional fillchar argument to ljust(), rjust(), and center() string methods.

Wed, 26 Nov 2003 08:21:35 +0000

Add optional fillchar argument to ljust(), rjust(), and center() string methods.