diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-01 02:32:32 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-01 02:32:32 (GMT) |
| commit | ed3a7d2d601ce1e65b0bacf24676440631158ec8 (patch) | |
| tree | d8e7df73bc7d9aa2c3cfafd4adb9838dffcea230 /Lib/test/test_smtplib.py | |
| parent | f10c400b91e44c5c744f4ddc05d90933cba3a56b (diff) | |
| download | cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.zip cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.tar.gz cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.tar.bz2 | |
#10273: Rename assertRegexpMatches and assertRaisesRegexp to assertRegex and assertRaisesRegex.
Diffstat (limited to 'Lib/test/test_smtplib.py')
| -rw-r--r-- | Lib/test/test_smtplib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index 795586a..4651f37 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -319,12 +319,12 @@ class DebuggingServerTests(unittest.TestCase): self.assertEqual(self.output.getvalue(), mexpect) debugout = smtpd.DEBUGSTREAM.getvalue() sender = re.compile("^sender: foo@bar.com$", re.MULTILINE) - self.assertRegexpMatches(debugout, sender) + self.assertRegex(debugout, sender) for addr in ('John', 'Sally', 'Fred', 'root@localhost', 'warped@silly.walks.com'): to_addr = re.compile(r"^recips: .*'{}'.*$".format(addr), re.MULTILINE) - self.assertRegexpMatches(debugout, to_addr) + self.assertRegex(debugout, to_addr) def testSendMessageWithSomeAddresses(self): # Make sure nothing breaks if not all of the three 'to' headers exist @@ -347,11 +347,11 @@ class DebuggingServerTests(unittest.TestCase): self.assertEqual(self.output.getvalue(), mexpect) debugout = smtpd.DEBUGSTREAM.getvalue() sender = re.compile("^sender: foo@bar.com$", re.MULTILINE) - self.assertRegexpMatches(debugout, sender) + self.assertRegex(debugout, sender) for addr in ('John', 'Dinsdale'): to_addr = re.compile(r"^recips: .*'{}'.*$".format(addr), re.MULTILINE) - self.assertRegexpMatches(debugout, to_addr) + self.assertRegex(debugout, to_addr) class NonConnectingTests(unittest.TestCase): |