backport effbot's checkin of

    revision 1.13 of pre.py

Fix bug #570057: Broken pre.subn() (and pre.sub())

This should be backported to the 2.2.X series (how
do I do that?)

diff --git a/Lib/pre.py b/Lib/pre.py
index 1665660bd8afb1d3df3e1a1fe50f28d625af44a3..7d5e85cf17c9f0551fc2cfdefe7cf0234f6726cc 100644 (file)
--- a/Lib/pre.py
+++ b/Lib/pre.py
@@ -361,10 +361,12 @@ class RegexObject:
         end = len(source)
 
         if type(repl) is type(''):
-            # See if repl contains group references
+            # See if repl contains group references (if it does,
+            # pcre_expand will attempt to call _Dummy.group, which
+            # results in a TypeError)
             try:
                 repl = pcre_expand(_Dummy, repl)
-            except error:
+            except (error, TypeError):
                 m = MatchObject(self, source, 0, end, [])
                 repl = lambda m, repl=repl, expand=pcre_expand: expand(m, repl)
             else: