Switch to test_support.get_attribute.
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 1e28ccf..e05b0da 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -204,29 +204,30 @@
sys.setrecursionlimit(oldlimit)
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)
+ # 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()
+ # This is how platform.py calls it. Make sure tuple
+ # still has 5 elements
+ maj, min, buildno, plat, csd = sys.getwindowsversion()
def test_dlopenflags(self):
if hasattr(sys, "setdlopenflags"):