From 452c706092c7d3fb7528cfd276cd83cac03d8bcd Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Sat, 4 Aug 2012 17:36:15 +0200
Subject: [PATCH] Make utils.str.perlRoToReplacer less ambiguous.

---
 src/utils/str.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/str.py b/src/utils/str.py
index ff48e4739..fac85f99b 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -45,7 +45,6 @@ from structures import TwoWayDictionary
 from supybot.i18n import PluginInternationalization
 internationalizeFunction=PluginInternationalization().internationalizeFunction
 
-curry = new.instancemethod
 chars = string.maketrans('', '')
 
 def rsplit(s, sep=None, maxsplit=-1):
@@ -195,9 +194,11 @@ def perlReToReplacer(s):
     if 'g' in flags:
         g = True
         flags = filter('g'.__ne__, flags)
+    if isinstance(flags, list):
+        flags = ''.join(flags)
     r = perlReToPythonRe(sep.join(('', regexp, flags)))
     if g:
-        return curry(r.sub, replace)
+        return lambda s: r.sub(replace, s)
     else:
         return lambda s: r.sub(replace, s, 1)