assertRegexMatches still exists for now. Use it.

jsmnbom · jsmnbom · commit 5408c23e3306 · 2016-10-16T12:48:45.000+02:00
diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -206,22 +206,13 @@ def test_and_or_filters(self):
         self.assertTrue((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION))
                         )(self.message))
 
-        try:
-            self.assertRegex(
-                str((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION)))),
-                r"<telegram.ext.filters.MergedFilter consisting of "
-                r"<telegram.ext.filters.Filters._Text object at .*?> and "
-                r"<telegram.ext.filters.MergedFilter consisting of "
-                r"<telegram.ext.filters.Filters._Forwarded object at .*?> or "
-                r"<telegram.ext.filters.Filters.entity object at .*?>>>")
-        except AttributeError:
-            self.assertRegexpMatches(
-                str((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION)))),
-                r"<telegram.ext.filters.MergedFilter consisting of "
-                r"<telegram.ext.filters.Filters._Text object at .*?> and "
-                r"<telegram.ext.filters.MergedFilter consisting of "
-                r"<telegram.ext.filters.Filters._Forwarded object at .*?> or "
-                r"<telegram.ext.filters.Filters.entity object at .*?>>>")
+        self.assertRegexpMatches(
+            str((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION)))),
+            r"<telegram.ext.filters.MergedFilter consisting of "
+            r"<telegram.ext.filters.Filters._Text object at .*?> and "
+            r"<telegram.ext.filters.MergedFilter consisting of "
+            r"<telegram.ext.filters.Filters._Forwarded object at .*?> or "
+            r"<telegram.ext.filters.Filters.entity object at .*?>>>")
 
     def test_faulty_custom_filter(self):
 
