Skip to content

Commit 1e94021

Browse files
committed
merge heads
2 parents 4fa68ab + 8fcda68 commit 1e94021

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎Doc/documenting/style.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Good example (establishing confident knowledge in the effective use of the langu
9292
Economy of Expression
9393
---------------------
9494

95-
More documentation is not necessarily better documentation. Error on the side
95+
More documentation is not necessarily better documentation. Err on the side
9696
of being succinct.
9797

9898
It is an unfortunate fact that making documentation longer can be an impediment
@@ -154,7 +154,7 @@ Audience
154154
The tone of the tutorial (and all the docs) needs to be respectful of the
155155
reader's intelligence. Don't presume that the readers are stupid. Lay out the
156156
relevant information, show motivating use cases, provide glossary links, and do
157-
our best to connect-the-dots, but don't talk down to them or waste their time.
157+
your best to connect the dots, but don't talk down to them or waste their time.
158158

159159
The tutorial is meant for newcomers, many of whom will be using the tutorial to
160160
evaluate the language as a whole. The experience needs to be positive and not

‎Lib/HTMLParser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def reset(self):
9999
markupbase.ParserBase.reset(self)
100100

101101
def feed(self, data):
102-
"""Feed data to the parser.
102+
r"""Feed data to the parser.
103103
104104
Call this as often as you want, with as little or as much text
105105
as you want (may include '\n').

‎Lib/distutils/tests/test_sdist.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ def test_get_file_list(self):
388388
self.assertEqual(len(manifest2), 6)
389389
self.assertIn('doc2.txt', manifest2[-1])
390390

391+
@unittest.skipUnless(zlib, "requires zlib")
391392
def test_manifest_marker(self):
392393
# check that autogenerated MANIFESTs have a marker
393394
dist, cmd = self.get_cmd()
@@ -404,6 +405,7 @@ def test_manifest_marker(self):
404405
self.assertEqual(manifest[0],
405406
'# file GENERATED by distutils, do NOT edit')
406407

408+
@unittest.skipUnless(zlib, "requires zlib")
407409
def test_manual_manifest(self):
408410
# check that a MANIFEST without a marker is left alone
409411
dist, cmd = self.get_cmd()

‎Lib/pkgutil.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
__all__ = [
1313
'get_importer', 'iter_importers', 'get_loader', 'find_loader',
14-
'walk_packages', 'iter_modules',
14+
'walk_packages', 'iter_modules', 'get_data',
1515
'ImpImporter', 'ImpLoader', 'read_code', 'extend_path',
1616
]
1717

0 commit comments

Comments
 (0)