Merged revisions 87222 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87222 | r.david.murray | 2010-12-13 20:22:50 -0500 (Mon, 13 Dec 2010) | 2 lines

  Use skipIf instead of a return when attribute doesn't exist.
........

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index a1029fd51954e763618a08a79f88f1e97d9055bc..c991b505596e2c0b732f5f1feef5d2c69e8b977a 100644 (file)
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -115,9 +115,9 @@ class TimeTestCase(unittest.TestCase):
         time.asctime(time.gmtime(self.t))
         self.assertRaises(TypeError, time.asctime, 0)
 
+    @unittest.skipIf(not hasattr(time, "tzset"),
+        "time module has no attribute tzset")
     def test_tzset(self):
-        if not hasattr(time, "tzset"):
-            return # Can't test this; don't want the test suite to fail
 
         from os import environ