Changeset 391 for python/trunk/Lib/test/test_quopri.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_quopri.py (modified) (5 diffs)

python/trunk/Lib/test/test_quopri.py

@@ -131 +131 @@
     def test_encodestring(self):
         for p, e in self.STRINGS:
-            self.assert_(quopri.encodestring(p) == e)
+            self.assertTrue(quopri.encodestring(p) == e)
 
     @withpythonimplementation
     def test_decodestring(self):
         for p, e in self.STRINGS:
-            self.assert_(quopri.decodestring(e) == p)
+            self.assertTrue(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.assertTrue(quopri.decodestring(quopri.encodestring(e)) == e)
 
     @withpythonimplementation
@@ -149 +149 @@
             outfp = cStringIO.StringIO()
             quopri.encode(infp, outfp, quotetabs=False)
-            self.assert_(outfp.getvalue() == e)
+            self.assertTrue(outfp.getvalue() == e)
 
     @withpythonimplementation
@@ -157 +157 @@
             outfp = cStringIO.StringIO()
             quopri.decode(infp, outfp)
-            self.assert_(outfp.getvalue() == p)
+            self.assertTrue(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.assertTrue(quopri.encodestring(p, quotetabs=True) == e)
+            self.assertTrue(quopri.decodestring(e) == p)
 
     @withpythonimplementation
     def test_encode_header(self):
         for p, e in self.HSTRINGS:
-            self.assert_(quopri.encodestring(p, header=True) == e)
+            self.assertTrue(quopri.encodestring(p, header=True) == e)
 
     @withpythonimplementation
     def test_decode_header(self):
         for p, e in self.HSTRINGS:
-            self.assert_(quopri.decodestring(e, header=True) == p)
+            self.assertTrue(quopri.decodestring(e, header=True) == p)
 
     def test_scriptencode(self):
@@ -179 +179 @@
         process = subprocess.Popen([sys.executable, "-mquopri"],
                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        self.addCleanup(process.stdout.close)
         cout, cerr = process.communicate(p)
         # On Windows, Python will output the result to stdout using
@@ -189 +190 @@
         process = subprocess.Popen([sys.executable, "-mquopri", "-d"],
                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        self.addCleanup(process.stdout.close)
         cout, cerr = process.communicate(e)
         self.assertEqual(cout.splitlines(), p.splitlines())