traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Branch merge

This commit is contained in:
Éric Araujo 2011-10-09 06:33:54 +02:00
parent 31b3763fa3 1a1a8a0e31
commit ece7079b54
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/gettext.rst
View File

@ -300,7 +300,7 @@ are the methods of :class:`NullTranslations`:
.. method:: lngettext(singular, plural, n) .. method:: lngettext(singular, plural, n)
If a fallback has been set, forward :meth:`ngettext` to the If a fallback has been set, forward :meth:`lngettext` to the
fallback. Otherwise, return the translated message. Overridden in derived fallback. Otherwise, return the translated message. Overridden in derived
classes. classes.
@ -756,8 +756,8 @@ implementations, and valuable experience to the creation of this module:
.. [#] See the footnote for :func:`bindtextdomain` above. .. [#] See the footnote for :func:`bindtextdomain` above.
.. [#] François Pinard has written a program called :program:`xpot` which does a .. [#] 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 similar job. It is available as part of his `po-utils package
://po-utils.progiciels-bpi.ca/. <http://po-utils.progiciels-bpi.ca/>`_.
.. [#] :program:`msgfmt.py` is binary compatible with GNU :program:`msgfmt` except that .. [#] :program:`msgfmt.py` is binary compatible with GNU :program:`msgfmt` except that
it provides a simpler, all-Python implementation. With this and it provides a simpler, all-Python implementation. With this and

4
Lib/distutils/tests/test_config_cmd.py
View File

@ -44,10 +44,10 @@ class ConfigTestCase(support.LoggingSilencer,
cmd = config(dist) cmd = config(dist)
# simple pattern searches # simple pattern searches
match = cmd.search_cpp(pattern='xxx', body='// xxx') match = cmd.search_cpp(pattern='xxx', body='/* xxx */')
self.assertEqual(match, 0) self.assertEqual(match, 0)
match = cmd.search_cpp(pattern='_configtest', body='// xxx') match = cmd.search_cpp(pattern='_configtest', body='/* xxx */')
self.assertEqual(match, 1) self.assertEqual(match, 1)
def test_finalize_options(self): def test_finalize_options(self):

13
Lib/test/test_sysconfig.py
View File

@ -1,9 +1,5 @@
"""Tests for 'site'. """Tests for sysconfig."""
Tests assume the initial paths in sys.path once the interpreter has begun
executing have not been removed.
"""
import unittest import unittest
import sys import sys
import os import os
@ -259,8 +255,15 @@ class TestSysConfig(unittest.TestCase):
# is similar to the global posix_prefix one # is similar to the global posix_prefix one
base = get_config_var('base') base = get_config_var('base')
user = get_config_var('userbase') user = get_config_var('userbase')
# the global scheme mirrors the distinction between prefix and
# exec-prefix but not the user scheme, so we have to adapt the paths
# before comparing (issue #9100)
adapt = sys.prefix != sys.exec_prefix
for name in ('stdlib', 'platstdlib', 'purelib', 'platlib'): for name in ('stdlib', 'platstdlib', 'purelib', 'platlib'):
global_path = get_path(name, 'posix_prefix') global_path = get_path(name, 'posix_prefix')
if adapt:
global_path = global_path.replace(sys.exec_prefix, sys.prefix)
base = base.replace(sys.exec_prefix, sys.prefix)
user_path = get_path(name, 'posix_user') user_path = get_path(name, 'posix_user')
self.assertEqual(user_path, global_path.replace(base, user, 1)) self.assertEqual(user_path, global_path.replace(base, user, 1))