]> granicus.if.org Git - python/commitdiff
Merged revisions 71014 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Thu, 2 Apr 2009 01:13:40 +0000 (01:13 +0000)
committerBenjamin Peterson <benjamin@python.org>
Thu, 2 Apr 2009 01:13:40 +0000 (01:13 +0000)
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71014 | benjamin.peterson | 2009-04-01 20:03:17 -0500 (Wed, 01 Apr 2009) | 1 line

  handle SEEK_ constants in test_io
........

Lib/test/test_io.py

index 53017f352a8f7922d6005cbac7c0f335757208fc..6658d78f6c5f11da50fd54d3fa5ba13d521368e1 100644 (file)
@@ -1996,13 +1996,13 @@ class MiscIOTest(unittest.TestCase):
     def test___all__(self):
         for name in self.io.__all__:
             obj = getattr(self.io, name, None)
-            self.assert_(obj is not None, name)
+            self.assertTrue(obj is not None, name)
             if name == "open":
                 continue
             elif "error" in name.lower():
-                self.assert_(issubclass(obj, Exception), name)
-            else:
-                self.assert_(issubclass(obj, self.IOBase), name)
+                self.assertTrue(issubclass(obj, Exception), name)
+            elif not name.startswith("SEEK_"):
+                self.assertTrue(issubclass(obj, self.IOBase))
 
     def test_attributes(self):
         f = self.open(support.TESTFN, "wb", buffering=0)