Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

regexp_wrapper: return None instead of False when search times out (#1379) 

This allows plugins to detect whether a search timed out or did not match, which are two distinct outcomes.
This commit is contained in:
James Lu 2019-10-17 12:30:07 -07:00 committed by GitHub
parent 27e7d6a9ac
commit b54d8f8073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands.py
View File

@ -149,7 +149,7 @@ def process(f, *args, **kwargs):
def regexp_wrapper(s, reobj, timeout, plugin_name, fcn_name):
'''A convenient wrapper to stuff regexp search queries through a subprocess.
This is used because specially-crafted regexps can use exponential time
and hang the bot.'''
def re_bool(s, reobj):
@ -163,7 +163,7 @@ def regexp_wrapper(s, reobj, timeout, plugin_name, fcn_name):
v = process(re_bool, s, reobj, timeout=timeout, pn=plugin_name, cn=fcn_name)
return v
except ProcessTimeoutError:
return False
return None
class UrlSnarfThread(world.SupyThread):
def __init__(self, *args, **kwargs):