From 1c814933dad1bea8eff9fbb8c39064d6de379a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sun, 8 May 2011 16:27:13 +0200 Subject: Make test_distutils pass without zlib (fixes #9435) --- Lib/distutils/tests/test_sdist.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Lib') diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index 54a32b88f5..61f9c1f79b 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() -- cgit v1.2.1 From 03c662ba06d3de56cb6ce18bff3d4b4da6fc3c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 25 May 2011 18:11:24 +0200 Subject: Add missing name in pkgutil.__all__ --- Lib/pkgutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib') diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index c50928f701..322bbdf5cb 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', ] -- cgit v1.2.1 From 20d4574b0deea32712a217ca13b91142fbded4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 25 May 2011 18:11:43 +0200 Subject: Fix display of html.parser.HTMLParser.feed docstrin --- Lib/HTMLParser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib') diff --git a/Lib/HTMLParser.py b/Lib/HTMLParser.py index e0189011d1..884d2a53c5 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'). -- cgit v1.2.1