diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-05-26 16:52:22 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-05-26 16:52:22 +0200 |
| commit | e8e9475764c33f9a49d1e155a3f60eefcb822a0b (patch) | |
| tree | 449cda6486847b5ef025869827728662d9d8d234 /Lib | |
| parent | ce333ffbea033715dfad11766b97f7722453079c (diff) | |
| parent | 20d4574b0deea32712a217ca13b91142fbded4c4 (diff) | |
| download | cpython-e8e9475764c33f9a49d1e155a3f60eefcb822a0b.tar.gz | |
Branch merge
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/HTMLParser.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_sdist.py | 2 | ||||
| -rw-r--r-- | Lib/pkgutil.py | 2 |
3 files changed, 4 insertions, 2 deletions
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'). 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() 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', ] |