[Python-checkins] r87224 - in python/branches/release27-maint: Lib/test/test_time.py

Tue Dec 14 02:28:59 CET 2010

Author: r.david.murray
Date: Tue Dec 14 02:28:59 2010
New Revision: 87224
Log:
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 (2010年12月13日) | 2 lines
 
 Use skipIf instead of a return when attribute doesn't exist.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/test/test_time.py
Modified: python/branches/release27-maint/Lib/test/test_time.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_time.py	(original)
+++ python/branches/release27-maint/Lib/test/test_time.py	Tue Dec 14 02:28:59 2010
@@ -115,9 +115,9 @@
 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
 
