diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-05-25 16:13:49 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-05-25 16:13:49 (GMT) |
| commit | 51b7aedaddb357340fa219d89f263269562d1f62 (patch) | |
| tree | cf84d711f7299ed0814093ecc4e52a88a967013d | |
| parent | d4701f426261b93fa528712c0c44426bccdfed41 (diff) | |
| parent | 29ef0064de57da79f328a2499b705e4751f339ca (diff) | |
| download | cpython-51b7aedaddb357340fa219d89f263269562d1f62.zip cpython-51b7aedaddb357340fa219d89f263269562d1f62.tar.gz cpython-51b7aedaddb357340fa219d89f263269562d1f62.tar.bz2 | |
Merge 3.1
| -rw-r--r-- | Lib/html/parser.py | 2 | ||||
| -rw-r--r-- | Lib/pkgutil.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/html/parser.py b/Lib/html/parser.py index a3586eb..9412280 100644 --- a/Lib/html/parser.py +++ b/Lib/html/parser.py @@ -124,7 +124,7 @@ class HTMLParser(_markupbase.ParserBase): _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/pkgutil.py b/Lib/pkgutil.py index b486275..2d88568 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -8,7 +8,7 @@ from types import ModuleType __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', ] |