traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2011-05-26 09:57:21 -05:00
parent 4fa68ab10b 8fcda6829a
commit 1e94021ea5
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/documenting/style.rst
View File

@ -92,7 +92,7 @@ Good example (establishing confident knowledge in the effective use of the langu
Economy of Expression 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. of being succinct.
It is an unfortunate fact that making documentation longer can be an impediment 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 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 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 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 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 evaluate the language as a whole. The experience needs to be positive and not

2
Lib/HTMLParser.py
View File

@ -99,7 +99,7 @@ class HTMLParser(markupbase.ParserBase):
markupbase.ParserBase.reset(self) markupbase.ParserBase.reset(self)
def feed(self, data): 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 Call this as often as you want, with as little or as much text
as you want (may include '\n'). as you want (may include '\n').

2
Lib/distutils/tests/test_sdist.py
View File

@ -388,6 +388,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
self.assertEqual(len(manifest2), 6) self.assertEqual(len(manifest2), 6)
self.assertIn('doc2.txt', manifest2[-1]) self.assertIn('doc2.txt', manifest2[-1])
@unittest.skipUnless(zlib, "requires zlib")
def test_manifest_marker(self): def test_manifest_marker(self):
# check that autogenerated MANIFESTs have a marker # check that autogenerated MANIFESTs have a marker
dist, cmd = self.get_cmd() dist, cmd = self.get_cmd()
@ -404,6 +405,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
self.assertEqual(manifest[0], self.assertEqual(manifest[0],
'# file GENERATED by distutils, do NOT edit') '# file GENERATED by distutils, do NOT edit')
@unittest.skipUnless(zlib, "requires zlib")
def test_manual_manifest(self): def test_manual_manifest(self):
# check that a MANIFEST without a marker is left alone # check that a MANIFEST without a marker is left alone
dist, cmd = self.get_cmd() dist, cmd = self.get_cmd()

2
Lib/pkgutil.py
View File

@ -11,7 +11,7 @@ from types import ModuleType
__all__ = [ __all__ = [
'get_importer', 'iter_importers', 'get_loader', 'find_loader', 'get_importer', 'iter_importers', 'get_loader', 'find_loader',
'walk_packages', 'iter_modules', 'walk_packages', 'iter_modules', 'get_data',
'ImpImporter', 'ImpLoader', 'read_code', 'extend_path', 'ImpImporter', 'ImpLoader', 'read_code', 'extend_path',
] ]