OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-12-23 06:50:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

regexhandler/stringregexhandler: python2 utf8 support

Browse source
This commit is contained in:
Noam Meltzer 2016-04-25 09:43:58 +03:00
parent 835c4d04c1
commit 05a90dc3bc
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
telegram/ext/regexhandler.py
View file

@ -21,6 +21,8 @@
import re import re
from future.utils import string_types
from .handler import Handler from .handler import Handler
from telegram import Update from telegram import Update
@ -52,7 +54,7 @@ class RegexHandler(Handler):
pass_groupdict=False, pass_update_queue=False): pass_groupdict=False, pass_update_queue=False):
super(RegexHandler, self).__init__(callback, pass_update_queue) super(RegexHandler, self).__init__(callback, pass_update_queue)
if isinstance(pattern, str): if isinstance(pattern, string_types):
pattern = re.compile(pattern) pattern = re.compile(pattern)
self.pattern = pattern self.pattern = pattern

11
telegram/ext/stringregexhandler.py
View file

@ -21,6 +21,8 @@
import re import re
from future.utils import string_types
from .handler import Handler from .handler import Handler
@ -51,7 +53,7 @@ class StringRegexHandler(Handler):
pass_groupdict=False, pass_update_queue=False): pass_groupdict=False, pass_update_queue=False):
super(StringRegexHandler, self).__init__(callback, pass_update_queue) super(StringRegexHandler, self).__init__(callback, pass_update_queue)
if isinstance(pattern, str): if isinstance(pattern, string_types):
pattern = re.compile(pattern) pattern = re.compile(pattern)
self.pattern = pattern self.pattern = pattern
@ -59,11 +61,8 @@ class StringRegexHandler(Handler):
self.pass_groupdict = pass_groupdict self.pass_groupdict = pass_groupdict
def checkUpdate(self, update): def checkUpdate(self, update):
if isinstance(update, str): return isinstance(update, string_types) and bool(
match = re.match(self.pattern, update) re.match(self.pattern, update))
return bool(match)
else:
return False
def handleUpdate(self, update, dispatcher): def handleUpdate(self, update, dispatcher):
optional_args = self.collectOptionalArgs(dispatcher) optional_args = self.collectOptionalArgs(dispatcher)