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

Merge 3.2

This commit is contained in:
Éric Araujo 2011-05-25 18:22:26 +02:00
parent 0f67a99fc9 51b7aedadd
commit aa1ef2d735
3 changed files with 4 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

@ -136,7 +136,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
@ -198,7 +198,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/html/parser.py
View File

@ -124,7 +124,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/pkgutil.py
View File

@ -8,7 +8,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',
] ]