merge heads
diff --git a/Doc/documenting/style.rst b/Doc/documenting/style.rst
index 80955fd..1928940 100644
--- a/Doc/documenting/style.rst
+++ b/Doc/documenting/style.rst
@@ -92,7 +92,7 @@
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 @@
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
diff --git a/Lib/HTMLParser.py b/Lib/HTMLParser.py
index e018901..884d2a5 100644
--- a/Lib/HTMLParser.py
+++ b/Lib/HTMLParser.py
@@ -99,7 +99,7 @@
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 54a32b8..61f9c1f 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -388,6 +388,7 @@
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 @@
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 c50928f..322bbdf 100644
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -11,7 +11,7 @@
__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',
]