Merge lp:~max-rabkin/ibid/factoid-ci-replace-709175 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Use regexen to do string replacement, allowing case-insensitive replacement

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/factoid.py'
--- ibid/plugins/factoid.py	2011-02-21 15:37:58 +0000
+++ ibid/plugins/factoid.py	2011-02-24 19:13:19 +0000
@@ -739,23 +739,27 @@
             op, search, replace, flags = parts
             flags = flags.lower()
             if op == "s":
-                if "r" in flags:
-                    if "i" in flags:
-                        search += "(?i)"
-                    try:
-                        factoid[2].value = re.sub(search, replace, oldvalue, int("g" not in flags))
-                    except:
-                        event.addresponse(u"That operation makes no sense. Try something like s/foo/bar/")
-                        return
-                else:
-                    newvalue = oldvalue.replace(search, replace, "g" in flags and -1 or 1)
-                    if newvalue == oldvalue:
-                        event.addresponse(u"I couldn't find '%(terms)s' in '%(oldvalue)s'. If that was a proper regular expression, append the 'r' flag", {
-                            'terms': search,
-                            'oldvalue': oldvalue,
-                        })
-                        return
-                    factoid[2].value = newvalue
+                if "r" not in flags:
+                    plain_search = search
+                    search = re.escape(search)
+                    replace = replace.replace('\\', '\\\\')
+                if "i" in flags:
+                    search += "(?i)"
+                try:
+                    if "r" not in flags and not re.search(search, oldvalue):
+                        event.addresponse(u"I couldn't find '%(terms)s' in "
+                                          u"'%(oldvalue)s'. If that was a "
+                                          u"proper regular expression, append "
+                                          u"the 'r' flag", {
+                                                'terms': plain_search,
+                                                'oldvalue': oldvalue,
+                                            })
+                        return
+
+                    factoid[2].value = re.sub(search, replace, oldvalue, int("g" not in flags))
+                except:
+                    event.addresponse(u"That operation makes no sense. Try something like s/foo/bar/")
+                    return
 
             elif op == "y":
                 if len(search) != len(replace):