merge

rhettinger · rhettinger · commit 87d89d9714eb · 2016-11-24T10:50:57.000-08:00
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
@@ -117,7 +117,7 @@ def __exit__(self, type, value, traceback):
         def fooLacksEnter():
             foo = LacksEnter()
             with foo: pass
-        self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnter)
+        self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnter)
 
     def testEnterAttributeError2(self):
         class LacksEnterAndExit(object):
@@ -126,7 +126,7 @@ class LacksEnterAndExit(object):
         def fooLacksEnterAndExit():
             foo = LacksEnterAndExit()
             with foo: pass
-        self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnterAndExit)
+        self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnterAndExit)
 
     def testExitAttributeError(self):
         class LacksExit(object):
@@ -136,7 +136,7 @@ def __enter__(self):
         def fooLacksExit():
             foo = LacksExit()
             with foo: pass
-        self.assertRaisesRegexp(AttributeError, '__exit__', fooLacksExit)
+        self.assertRaisesRegex(AttributeError, '__exit__', fooLacksExit)
 
     def assertRaisesSyntaxError(self, codestr):
         def shouldRaiseSyntaxError(s):
