regexhandler/stringregexhandler: python2 utf8 support

tsnoam · tsnoam · commit 05a90dc3bcee · 2016-04-26T17:47:37.000+03:00
diff --git a/telegram/ext/regexhandler.py b/telegram/ext/regexhandler.py
@@ -21,6 +21,8 @@
 
 import re
 
+from future.utils import string_types
+
 from .handler import Handler
 from telegram import Update
 
@@ -52,7 +54,7 @@ def __init__(self, pattern, callback, pass_groups=False,
                  pass_groupdict=False, pass_update_queue=False):
         super(RegexHandler, self).__init__(callback, pass_update_queue)
 
-        if isinstance(pattern, str):
+        if isinstance(pattern, string_types):
             pattern = re.compile(pattern)
 
         self.pattern = pattern
diff --git a/telegram/ext/stringregexhandler.py b/telegram/ext/stringregexhandler.py
@@ -21,6 +21,8 @@
 
 import re
 
+from future.utils import string_types
+
 from .handler import Handler
 
 
@@ -51,19 +53,16 @@ def __init__(self, pattern, callback, pass_groups=False,
                  pass_groupdict=False, pass_update_queue=False):
         super(StringRegexHandler, self).__init__(callback, pass_update_queue)
 
-        if isinstance(pattern, str):
+        if isinstance(pattern, string_types):
             pattern = re.compile(pattern)
 
         self.pattern = pattern
         self.pass_groups = pass_groups
         self.pass_groupdict = pass_groupdict
 
     def checkUpdate(self, update):
-        if isinstance(update, str):
-            match = re.match(self.pattern, update)
-            return bool(match)
-        else:
-            return False
+        return isinstance(update, string_types) and bool(
+            re.match(self.pattern, update))
 
     def handleUpdate(self, update, dispatcher):
         optional_args = self.collectOptionalArgs(dispatcher)
