[Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1

[eric.araujo]

http://hg.python.org/cpython/rev/a80b8adc575d
changeset:   70410:a80b8adc575d
branch:      3.2
parent:      70409:a17510934251
parent:      70408:70e51d7285c4
user:        Éric Araujo <merwok at netwok.org>
date:        Wed May 25 18:13:49 2011 +0200
summary:
  Merge 3.1

files:
  Lib/html/parser.py |  2 +-
  Lib/pkgutil.py     |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/html/parser.py b/Lib/html/parser.py
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -124,7 +124,7 @@
         _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
--- 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',
 ]
 

-- 
Repository URL: http://hg.python.org/cpython