diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:03:01 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:03:01 +0000 |
| commit | 71c9786c2b817ccb5153e450bbe69936678e6db2 (patch) | |
| tree | aa37054e5dadbdcda1f54a5bb1e46bc1a42626da /Doc/library/locale.rst | |
| parent | 2277ff90e2159da7762dc2b2a3b91fee9e03e0bb (diff) | |
| download | cpython-71c9786c2b817ccb5153e450bbe69936678e6db2.tar.gz | |
Merged revisions 83226-83227,83229-83232 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83226 | georg.brandl | 2010-07-29 16:17:12 +0200 (Do, 29 Jul 2010) | 1 line
#1090076: explain the behavior of *vars* in get() better.
........
r83227 | georg.brandl | 2010-07-29 16:23:06 +0200 (Do, 29 Jul 2010) | 1 line
Use Py_CLEAR().
........
r83229 | georg.brandl | 2010-07-29 16:32:22 +0200 (Do, 29 Jul 2010) | 1 line
#9407: document configparser.Error.
........
r83230 | georg.brandl | 2010-07-29 16:36:11 +0200 (Do, 29 Jul 2010) | 1 line
Use correct directive and name.
........
r83231 | georg.brandl | 2010-07-29 16:46:07 +0200 (Do, 29 Jul 2010) | 1 line
#9397: remove mention of dbm.bsd which does not exist anymore.
........
r83232 | georg.brandl | 2010-07-29 16:49:08 +0200 (Do, 29 Jul 2010) | 1 line
#9388: remove ERA_YEAR which is never defined in the source code.
........
Diffstat (limited to 'Doc/library/locale.rst')
| -rw-r--r-- | Doc/library/locale.rst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst index b536515862..b9c001f139 100644 --- a/Doc/library/locale.rst +++ b/Doc/library/locale.rst @@ -244,10 +244,6 @@ The :mod:`locale` module defines the following exception and functions: specified, and therefore you should not assume knowledge of it on different systems. - .. data:: ERA_YEAR - - Get the year in the relevant era of the locale. - .. data:: ERA_D_T_FMT Get a format string for :func:`strftime` to represent dates and times in a |