Merge branch 'client_side_trunc'

2015-04-22 17:46:14 -07:00 · 2015-04-22 17:46:14 -07:00 · 7e7d8ee7ac
parent d0a49ec3b8 c328be7deb
commit 7e7d8ee7ac
1 changed files with 0 additions and 6 deletions
--- a/tests/base.py
+++ b/tests/base.py
@ -5,12 +5,6 @@ import six


 class BaseTestCase(unittest.TestCase):
-    def __init__(self, *args, **kwargs):
-        super(BaseTestCase, self).__init__(*args, **kwargs)
-        if six.PY2:
-            self.assertRegex = self.assertRegexpMatches
-            self.assertCountEqual = self.assertItemsEqual
-
    def assertIn(self, object, collection):
        if six.PY2 and sys.version_info[1] <= 6:
            return self.assertTrue(object in collection)