python compat - assertraisesregex

[michaelplatings]

bindings/python/llvm/tests/base.py

21 ↗

(On Diff #180014)

I think this should be:
assertRaisesRegex = unittest.TestCase.assertRaisesRegexp

[serge-sans-paille]

bindings/python/llvm/tests/base.py

21 ↗

(On Diff #180014)

Well It's actually the same as TestBase inherits from unittest.TestCase.

I prefer this form because it makes the renaming more explicit.

[michaelplatings]

bindings/python/llvm/tests/base.py

21 ↗

(On Diff #180014)

Doesn't work for me:
NameError: name 'TestBase' is not defined

[michaelplatings]

LGTM

llvm/trunk/bindings/python/llvm/tests/base.py

 import os.path
+import sys
 import unittest
 
+
 POSSIBLE_TEST_BINARIES = [
     'libreadline.so.5',
     'libreadline.so.6',
 ]
 
 POSSIBLE_TEST_BINARY_PATHS = [
     '/usr/lib/debug',
     '/lib',
     '/usr/lib',
     '/usr/local/lib',
     '/lib/i386-linux-gnu',
 ]
 
 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.
 
         FIXME Support additional, highly-likely targets or create one
         ourselves.
         """
         for d in POSSIBLE_TEST_BINARY_PATHS:
             for lib in POSSIBLE_TEST_BINARIES:

llvm/trunk/bindings/python/llvm/tests/test_disassembler.py

def test_basic(self):
 
         disassembler = Disassembler(triple)
 
         count, s = disassembler.get_instruction(sequence)
         self.assertEqual(count, 3)
         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):
         sequence = '\x67\xe3\x81\x01\xc7' # jcxz -127; addl %eax, %edi
 
         disassembler = Disassembler('i686-apple-darwin9')
 
         instructions = list(disassembler.get_instructions(sequence))