[Python-checkins] r71016 - in python/branches/py3k: Lib/test/test_io.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Apr  2 03:13:40 2009
New Revision: 71016

Log:
Merged revisions 71014 via svnmerge from 
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_io.py

Modified: python/branches/py3k/Lib/test/test_io.py
==============================================================================
--- python/branches/py3k/Lib/test/test_io.py	(original)
+++ python/branches/py3k/Lib/test/test_io.py	Thu Apr  2 03:13:40 2009
@@ -1996,13 +1996,13 @@
     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)