Merged revisions 77775 via svnmerge from

ericvsmith · ericvsmith · commit 05f337440298 · 2010-01-27T01:25:02.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77775 | eric.smith | 2010-01-26 20:21:15 -0500 (Tue, 26 Jan 2010) | 1 line

  Switch to test_support.get_attribute.
........
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -226,29 +226,30 @@ def f():
                 err)
 
     def test_getwindowsversion(self):
-        if hasattr(sys, "getwindowsversion"):
-            v = sys.getwindowsversion()
-            self.assertEqual(len(v), 5)
-            self.assertIsInstance(v[0], int)
-            self.assertIsInstance(v[1], int)
-            self.assertIsInstance(v[2], int)
-            self.assertIsInstance(v[3], int)
-            self.assertIsInstance(v[4], str)
-            self.assertRaises(IndexError, operator.getitem, v, 5)
-            self.assertIsInstance(v.major, int)
-            self.assertIsInstance(v.minor, int)
-            self.assertIsInstance(v.build, int)
-            self.assertIsInstance(v.platform, int)
-            self.assertIsInstance(v.service_pack, str)
-            self.assertEqual(v[0], v.major)
-            self.assertEqual(v[1], v.minor)
-            self.assertEqual(v[2], v.build)
-            self.assertEqual(v[3], v.platform)
-            self.assertEqual(v[4], v.service_pack)
-
-            # This is how platform.py calls it. Make sure tuple
-            #  still has 5 elements
-            maj, min, buildno, plat, csd = sys.getwindowsversion()
+        # Raise SkipTest if sys doesn't have getwindowsversion attribute
+        test.test_support.get_attribute(sys, "getwindowsversion")
+        v = sys.getwindowsversion()
+        self.assertEqual(len(v), 5)
+        self.assertIsInstance(v[0], int)
+        self.assertIsInstance(v[1], int)
+        self.assertIsInstance(v[2], int)
+        self.assertIsInstance(v[3], int)
+        self.assertIsInstance(v[4], str)
+        self.assertRaises(IndexError, operator.getitem, v, 5)
+        self.assertIsInstance(v.major, int)
+        self.assertIsInstance(v.minor, int)
+        self.assertIsInstance(v.build, int)
+        self.assertIsInstance(v.platform, int)
+        self.assertIsInstance(v.service_pack, str)
+        self.assertEqual(v[0], v.major)
+        self.assertEqual(v[1], v.minor)
+        self.assertEqual(v[2], v.build)
+        self.assertEqual(v[3], v.platform)
+        self.assertEqual(v[4], v.service_pack)
+
+        # This is how platform.py calls it. Make sure tuple
+        #  still has 5 elements
+        maj, min, buildno, plat, csd = sys.getwindowsversion()
 
     def test_call_tracing(self):
         self.assertRaises(TypeError, sys.call_tracing, type, 2)
