From eb35f25412c0034f6190f3d8f144b80c6928249f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 8 Oct 2011 02:15:04 +0200 Subject: [PATCH 1/3] Fix a typo and a broken link (part of #10536). Found by Franz Glasner in #2504. --- Doc/library/gettext.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst index c55aaf4def8..9b4eb0c73bf 100644 --- a/Doc/library/gettext.rst +++ b/Doc/library/gettext.rst @@ -300,7 +300,7 @@ are the methods of :class:`NullTranslations`: .. 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 classes. @@ -756,8 +756,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 + `_. .. [#] :program:`msgfmt.py` is binary compatible with GNU :program:`msgfmt` except that it provides a simpler, all-Python implementation. With this and From 5fb16cd1d281c69b443c3c8027a2f03721f2680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 8 Oct 2011 02:15:55 +0200 Subject: [PATCH 2/3] Make C code in one distutils test comply with ISO C (#10359). Patch by Hallvard B Furuseth. --- Lib/distutils/tests/test_config_cmd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py index a36a1d5b492..2cf3886cb5b 100644 --- a/Lib/distutils/tests/test_config_cmd.py +++ b/Lib/distutils/tests/test_config_cmd.py @@ -44,10 +44,10 @@ class ConfigTestCase(support.LoggingSilencer, cmd = config(dist) # simple pattern searches - match = cmd.search_cpp(pattern='xxx', body='// xxx') + match = cmd.search_cpp(pattern='xxx', body='/* xxx */') self.assertEqual(match, 0) - match = cmd.search_cpp(pattern='_configtest', body='// xxx') + match = cmd.search_cpp(pattern='_configtest', body='/* xxx */') self.assertEqual(match, 1) def test_finalize_options(self): From 1a1a8a0e31777f8b943b17f5551cac26a5671907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 8 Oct 2011 02:49:12 +0200 Subject: [PATCH 3/3] Fix test_sysconfig when prefix != exec-prefix (#9100). Reported by Zsolt Cserna. --- Lib/test/test_sysconfig.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 57d1f55fc4b..716fa5e40e8 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -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 sys import os @@ -259,8 +255,15 @@ class TestSysConfig(unittest.TestCase): # is similar to the global posix_prefix one base = get_config_var('base') 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'): 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') self.assertEqual(user_path, global_path.replace(base, user, 1))