From b76eb9743eed4db801979e6d4c111a49dc33ccfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sun, 8 May 2011 16:27:13 +0200 Subject: [PATCH 1/4] Make test_distutils pass without zlib (fixes #9435) --- Lib/distutils/tests/test_sdist.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index 54a32b88f5d..61f9c1f79b0 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -388,6 +388,7 @@ class SDistTestCase(PyPIRCCommandTestCase): self.assertEqual(len(manifest2), 6) self.assertIn('doc2.txt', manifest2[-1]) + @unittest.skipUnless(zlib, "requires zlib") def test_manifest_marker(self): # check that autogenerated MANIFESTs have a marker dist, cmd = self.get_cmd() @@ -404,6 +405,7 @@ class SDistTestCase(PyPIRCCommandTestCase): self.assertEqual(manifest[0], '# file GENERATED by distutils, do NOT edit') + @unittest.skipUnless(zlib, "requires zlib") def test_manual_manifest(self): # check that a MANIFEST without a marker is left alone dist, cmd = self.get_cmd() From 18176f06b52c1faf3be5ff89d95df10e5d12fe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 25 May 2011 18:06:16 +0200 Subject: [PATCH 2/4] Fix two typos --- Doc/documenting/style.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/documenting/style.rst b/Doc/documenting/style.rst index 80955fda580..192894085a2 100644 --- a/Doc/documenting/style.rst +++ b/Doc/documenting/style.rst @@ -92,7 +92,7 @@ Good example (establishing confident knowledge in the effective use of the langu Economy of Expression --------------------- -More documentation is not necessarily better documentation. Error on the side +More documentation is not necessarily better documentation. Err on the side of being succinct. It is an unfortunate fact that making documentation longer can be an impediment @@ -154,7 +154,7 @@ Audience The tone of the tutorial (and all the docs) needs to be respectful of the reader's intelligence. Don't presume that the readers are stupid. Lay out the relevant information, show motivating use cases, provide glossary links, and do -our best to connect-the-dots, but don't talk down to them or waste their time. +your best to connect the dots, but don't talk down to them or waste their time. The tutorial is meant for newcomers, many of whom will be using the tutorial to evaluate the language as a whole. The experience needs to be positive and not From ea088c5163e3ea3e37950433be32a864d4589eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 25 May 2011 18:11:24 +0200 Subject: [PATCH 3/4] Add missing name in pkgutil.__all__ --- Lib/pkgutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index c50928f701d..322bbdf5cb6 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -11,7 +11,7 @@ from types import ModuleType __all__ = [ 'get_importer', 'iter_importers', 'get_loader', 'find_loader', - 'walk_packages', 'iter_modules', + 'walk_packages', 'iter_modules', 'get_data', 'ImpImporter', 'ImpLoader', 'read_code', 'extend_path', ] From 31890bc9ba7c46ed5bcdb91de39f7251badca8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 25 May 2011 18:11:43 +0200 Subject: [PATCH 4/4] Fix display of html.parser.HTMLParser.feed docstrin --- Lib/HTMLParser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/HTMLParser.py b/Lib/HTMLParser.py index e0189011d11..884d2a53c52 100644 --- a/Lib/HTMLParser.py +++ b/Lib/HTMLParser.py @@ -99,7 +99,7 @@ class HTMLParser(markupbase.ParserBase): markupbase.ParserBase.reset(self) def feed(self, data): - """Feed data to the parser. + r"""Feed data to the parser. Call this as often as you want, with as little or as much text as you want (may include '\n').