PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-04-29 06:51:10 -05:00
Code Issues Projects Releases Wiki Activity

SedRegex: allow free form flags and return them in _unpack_sed()

Browse Source
This commit is contained in:
James Lu 2016-12-17 20:43:19 -08:00
parent 4b14b252ce
commit 423da9f996
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SedRegex/plugin.py
View File

@ -49,7 +49,7 @@ except ImportError:
# lower than 2.7.6: see https://stackoverflow.com/questions/3675144/regex-error-nothing-to-repeat # lower than 2.7.6: see https://stackoverflow.com/questions/3675144/regex-error-nothing-to-repeat
# and https://bugs.python.org/issue18647 # and https://bugs.python.org/issue18647
SED_REGEX = re.compile(r"^(?:(?P<nick>.+?)[:,] )?s(?P<delim>[^\w\s])(?P<pattern>.*?)(?P=delim)" SED_REGEX = re.compile(r"^(?:(?P<nick>.+?)[:,] )?s(?P<delim>[^\w\s])(?P<pattern>.*?)(?P=delim)"
r"(?P<replacement>.*?)(?:(?P=delim)(?P<flags>[gi]{0,2}))?$") r"(?P<replacement>.*?)(?:(?P=delim)(?P<flags>[a-z]+))?$")
# Replace newlines and friends with things like literal "\n" (backslash and "n") # Replace newlines and friends with things like literal "\n" (backslash and "n")
axe_spaces = utils.str.MultipleReplacer({'\n': '\\n', '\t': '\\t', '\r': '\\r'}) axe_spaces = utils.str.MultipleReplacer({'\n': '\\n', '\t': '\\t', '\r': '\\r'})
@ -101,7 +101,7 @@ class SedRegex(callbacks.PluginRegexp):
pattern = re.compile(pattern, flags) pattern = re.compile(pattern, flags)
return (pattern, replacement, count) return (pattern, replacement, count, raw_flags)
def replacer(self, irc, msg, regex): def replacer(self, irc, msg, regex):
if not self.registryValue('enable', msg.args[0]): if not self.registryValue('enable', msg.args[0]):
@ -110,7 +110,7 @@ class SedRegex(callbacks.PluginRegexp):
msg.tag('Replacer') msg.tag('Replacer')
try: try:
(pattern, replacement, count) = self._unpack_sed(msg.args[1]) (pattern, replacement, count, flags) = self._unpack_sed(msg.args[1])
except (ValueError, re.error) as e: except (ValueError, re.error) as e:
self.log.warning(_("SedRegex error: %s"), e) self.log.warning(_("SedRegex error: %s"), e)
if self.registryValue('displayErrors', msg.args[0]): if self.registryValue('displayErrors', msg.args[0]):