Index: llvm/trunk/bindings/python/llvm/tests/base.py
===================================================================
--- llvm/trunk/bindings/python/llvm/tests/base.py
+++ llvm/trunk/bindings/python/llvm/tests/base.py
@@ -1,6 +1,8 @@
 import os.path
+import sys
 import unittest
 
+
 POSSIBLE_TEST_BINARIES = [
     'libreadline.so.5',
     'libreadline.so.6',
@@ -15,6 +17,9 @@
 ]
 
 class TestBase(unittest.TestCase):
+    if sys.version_info.major == 2:
+        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+
     def get_test_binary(self):
         """Helper to obtain a test binary for object file testing.
 
Index: llvm/trunk/bindings/python/llvm/tests/test_disassembler.py
===================================================================
--- llvm/trunk/bindings/python/llvm/tests/test_disassembler.py
+++ llvm/trunk/bindings/python/llvm/tests/test_disassembler.py
@@ -19,7 +19,7 @@
         self.assertEqual(s, '\tjcxz\t-127')
 
     def test_nonexistent_triple(self):
-        with self.assertRaisesRegexp(Exception, "Could not obtain disassembler for triple"):
+        with self.assertRaisesRegex(Exception, "Could not obtain disassembler for triple"):
             Disassembler("nonexistent-triple-raises")
 
     def test_get_instructions(self):