summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-26 14:49:59 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-26 14:49:59 (GMT)
commitdec2067b2a5fe4ae47ce67a55810885e6f0ae20b (patch)
tree289ca51df21d3c268211897636e1d219d483e079 /Lib
parenta80987f20d0c73532127e1c3f69f7983c5c443d2 (diff)
parent29ef0064de57da79f328a2499b705e4751f339ca (diff)
downloadcpython-dec2067b2a5fe4ae47ce67a55810885e6f0ae20b.zip
cpython-dec2067b2a5fe4ae47ce67a55810885e6f0ae20b.tar.gz
cpython-dec2067b2a5fe4ae47ce67a55810885e6f0ae20b.tar.bz2
Branch merge
Diffstat (limited to 'Lib')
-rw-r--r--Lib/html/parser.py2
-rw-r--r--Lib/pkgutil.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
index 3f68e18..bef5c3c 100644
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -99,7 +99,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 0ec6ec5..e2d630a 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',
]