Branch merge

merwok · merwok · commit dec2067b2a5f · 2011-05-26T16:49:59.000+02:00
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
@@ -99,7 +99,7 @@ def reset(self):
         _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
@@ -8,7 +8,7 @@
 
 __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',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`__all__ = [`
`10`	`10`	`'get_importer', 'iter_importers', 'get_loader', 'find_loader',`
`11`		`- 'walk_packages', 'iter_modules',`
	`11`	`+ 'walk_packages', 'iter_modules', 'get_data',`
`12`	`12`	`'ImpImporter', 'ImpLoader', 'read_code', 'extend_path',`
`13`	`13`	`]`
`14`	`14`