Changeset 391 for python/trunk/Lib/test/test_errno.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_errno.py (modified) (3 diffs)

python/trunk/Lib/test/test_errno.py

@@ -15 +15 @@
         # No unexpected attributes should be on the module.
         for error_code in std_c_errors:
-            self.assert_(hasattr(errno, error_code),
+            self.assertTrue(hasattr(errno, error_code),
                             "errno is missing %s" % error_code)
 
@@ -21 +21 @@
         # Every key value in errno.errorcode should be on the module.
         for value in errno.errorcode.itervalues():
-            self.assert_(hasattr(errno, value), 'no %s attr in errno' % value)
+            self.assertTrue(hasattr(errno, value), 'no %s attr in errno' % value)
 
 
@@ -29 +29 @@
         for attribute in errno.__dict__.iterkeys():
             if attribute.isupper():
-                self.assert_(getattr(errno, attribute) in errno.errorcode,
-                             'no %s attr in errno.errorcode' % attribute)
+                self.assertIn(getattr(errno, attribute), errno.errorcode,
+                              'no %s attr in errno.errorcode' % attribute)