Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-10-19 11:06:26 +03:00
commit f10644983e
41 changed files with 48 additions and 48 deletions

View file

@ -382,7 +382,7 @@ class BasicInterpolation(Interpolation):
would resolve the "%(dir)s" to the value of dir. All reference
expansions are done late, on demand. If a user needs to use a bare % in
a configuration file, she can escape it by writing %%. Other other % usage
a configuration file, she can escape it by writing %%. Other % usage
is considered a user error and raises `InterpolationSyntaxError'."""
_KEYCRE = re.compile(r"%\(([^)]+)\)s")