Branch merge

This commit is contained in:
Éric Araujo 2011-05-25 18:12:22 +02:00
commit 29ef0064de
2 changed files with 2 additions and 2 deletions

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').

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',
] ]