diff options
Diffstat (limited to 'Lib/test/test_quopri.py')
-rw-r--r-- | Lib/test/test_quopri.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_quopri.py b/Lib/test/test_quopri.py index 631c974..a9e9e80 100644 --- a/Lib/test/test_quopri.py +++ b/Lib/test/test_quopri.py @@ -130,17 +130,17 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''') @withpythonimplementation def test_encodestring(self): for p, e in self.STRINGS: - self.assert_(quopri.encodestring(p) == e) + self.assertEqual(quopri.encodestring(p), e) @withpythonimplementation def test_decodestring(self): for p, e in self.STRINGS: - self.assert_(quopri.decodestring(e) == p) + self.assertEqual(quopri.decodestring(e), p) @withpythonimplementation def test_idempotent_string(self): for p, e in self.STRINGS: - self.assert_(quopri.decodestring(quopri.encodestring(e)) == e) + self.assertEqual(quopri.decodestring(quopri.encodestring(e)), e) @withpythonimplementation def test_encode(self): @@ -148,7 +148,7 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''') infp = cStringIO.StringIO(p) outfp = cStringIO.StringIO() quopri.encode(infp, outfp, quotetabs=False) - self.assert_(outfp.getvalue() == e) + self.assertEqual(outfp.getvalue(), e) @withpythonimplementation def test_decode(self): @@ -156,13 +156,13 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''') infp = cStringIO.StringIO(e) outfp = cStringIO.StringIO() quopri.decode(infp, outfp) - self.assert_(outfp.getvalue() == p) + self.assertEqual(outfp.getvalue(), p) @withpythonimplementation def test_embedded_ws(self): for p, e in self.ESTRINGS: self.assert_(quopri.encodestring(p, quotetabs=True) == e) - self.assert_(quopri.decodestring(e) == p) + self.assertEqual(quopri.decodestring(e), p) @withpythonimplementation def test_encode_header(self): @@ -182,14 +182,14 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''') # On Windows, Python will output the result to stdout using # CRLF, as the mode of stdout is text mode. To compare this # with the expected result, we need to do a line-by-line comparison. - self.assert_(cout.splitlines() == e.splitlines()) + self.assertEqual(cout.splitlines(), e.splitlines()) def test_scriptdecode(self): (p, e) = self.STRINGS[-1] process = subprocess.Popen([sys.executable, "-mquopri", "-d"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) cout, cerr = process.communicate(e) - self.assert_(cout.splitlines() == p.splitlines()) + self.assertEqual(cout.splitlines(), p.splitlines()) def test_main(): test_support.run_unittest(QuopriTestCase) |