From e4d6c0c51758f25ed5f97323e084a65028c9b640 Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Fri, 23 Aug 2002 16:34:08 +0000 Subject: [PATCH] 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?) --- Lib/pre.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/pre.py b/Lib/pre.py index 1665660bd8af..7d5e85cf17c9 100644 --- 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: -- 2.47.3