diff options
author | Éric Araujo <merwok@netwok.org> | 2011-10-09 06:55:04 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-10-09 06:55:04 (GMT) |
commit | 9255464dfb3a444eb5b7ea0a4e7c440d49a712be (patch) | |
tree | 9cededacec855c581a318f707d9d73480c14feeb /Doc/library | |
parent | eaf139b3fc22be22e2c23d84d65a5c344df684a2 (diff) | |
parent | a29e4f64c1dfeb4ca1cf9f4c9636cb4528b2fd8c (diff) | |
download | cpython-9255464dfb3a444eb5b7ea0a4e7c440d49a712be.zip cpython-9255464dfb3a444eb5b7ea0a4e7c440d49a712be.tar.gz cpython-9255464dfb3a444eb5b7ea0a4e7c440d49a712be.tar.bz2 |
Branch merge
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/gettext.rst | 6 | ||||
-rw-r--r-- | Doc/library/packaging.util.rst | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst index bc825cc..0fa022c 100644 --- a/Doc/library/gettext.rst +++ b/Doc/library/gettext.rst @@ -263,7 +263,7 @@ are the methods of :class:`NullTranslations`: .. method:: lngettext(singular, plural, n) - If a fallback has been set, forward :meth:`ngettext` to the fallback. + If a fallback has been set, forward :meth:`lngettext` to the fallback. Otherwise, return the translated message. Overridden in derived classes. @@ -644,8 +644,8 @@ implementations, and valuable experience to the creation of this module: .. [#] See the footnote for :func:`bindtextdomain` above. .. [#] François Pinard has written a program called :program:`xpot` which does a - similar job. It is available as part of his :program:`po-utils` package at http - ://po-utils.progiciels-bpi.ca/. + similar job. It is available as part of his `po-utils package + <http://po-utils.progiciels-bpi.ca/>`_. .. [#] :program:`msgfmt.py` is binary compatible with GNU :program:`msgfmt` except that it provides a simpler, all-Python implementation. With this and diff --git a/Doc/library/packaging.util.rst b/Doc/library/packaging.util.rst index 019f3e9..ae96d87 100644 --- a/Doc/library/packaging.util.rst +++ b/Doc/library/packaging.util.rst @@ -121,9 +121,12 @@ This module contains various helpers for the other modules. .. function:: byte_compile(py_files[, optimize=0, force=0, prefix=None, base_dir=None, verbose=1, dry_run=0, direct=None]) Byte-compile a collection of Python source files to either :file:`.pyc` or - :file:`.pyo` files in the same directory. *py_files* is a list of files to - compile; any files that don't end in :file:`.py` are silently skipped. - *optimize* must be one of the following: + :file:`.pyo` files in a :file:`__pycache__` subdirectory (see :pep:`3147`), + or to the same directory when using the distutils2 backport on Python + versions older than 3.2. + + *py_files* is a list of files to compile; any files that don't end in + :file:`.py` are silently skipped. *optimize* must be one of the following: * ``0`` - don't optimize (generate :file:`.pyc`) * ``1`` - normal optimization (like ``python -O``) |