Mailman 3 January 2010 - Python-checkins

r77777 - in python/branches/py3k: Lib/test/test_sys.py
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 02:25:02 2010 New Revision: 77777 Log: Merged revisions 77775 via svnmerge from 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. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_sys.py Modified: python/branches/py3k/Lib/test/test_sys.py ============================================================================== --- python/branches/py3k/Lib/test/test_sys.py (original) +++ python/branches/py3k/Lib/test/test_sys.py Wed Jan 27 02:25:02 2010 @@ -226,29 +226,30 @@ 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)

1 0

r77776 - python/branches/release26-maint
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 02:24:06 2010 New Revision: 77776 Log: Blocked revisions 77775 via svnmerge ........ r77775 | eric.smith | 2010-01-26 20:21:15 -0500 (Tue, 26 Jan 2010) | 1 line Switch to test_support.get_attribute. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77775 - python/trunk/Lib/test/test_sys.py
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 02:21:15 2010 New Revision: 77775 Log: Switch to test_support.get_attribute. Modified: python/trunk/Lib/test/test_sys.py Modified: python/trunk/Lib/test/test_sys.py ============================================================================== --- python/trunk/Lib/test/test_sys.py (original) +++ python/trunk/Lib/test/test_sys.py Wed Jan 27 02:21:15 2010 @@ -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) - - # 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_dlopenflags(self): if hasattr(sys, "setdlopenflags"):

1 0

r77774 - python/branches/release31-maint
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 02:00:29 2010 New Revision: 77774 Log: Blocked revisions 77773 via svnmerge ................ r77773 | eric.smith | 2010-01-26 19:59:59 -0500 (Tue, 26 Jan 2010) | 9 lines Merged revisions 77771 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77771 | eric.smith | 2010-01-26 19:58:43 -0500 (Tue, 26 Jan 2010) | 1 line Removed unneeded test. ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r77773 - in python/branches/py3k: Lib/test/test_sys.py
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:59:59 2010 New Revision: 77773 Log: Merged revisions 77771 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77771 | eric.smith | 2010-01-26 19:58:43 -0500 (Tue, 26 Jan 2010) | 1 line Removed unneeded test. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_sys.py Modified: python/branches/py3k/Lib/test/test_sys.py ============================================================================== --- python/branches/py3k/Lib/test/test_sys.py (original) +++ python/branches/py3k/Lib/test/test_sys.py Wed Jan 27 01:59:59 2010 @@ -228,7 +228,6 @@ def test_getwindowsversion(self): if hasattr(sys, "getwindowsversion"): v = sys.getwindowsversion() - self.assertTrue(isinstance(v[:], tuple)) self.assertEqual(len(v), 5) self.assertIsInstance(v[0], int) self.assertIsInstance(v[1], int)

1 0

r77772 - python/branches/release26-maint
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:59:22 2010 New Revision: 77772 Log: Blocked revisions 77771 via svnmerge ........ r77771 | eric.smith | 2010-01-26 19:58:43 -0500 (Tue, 26 Jan 2010) | 1 line Removed unneeded test. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77771 - python/trunk/Lib/test/test_sys.py
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:58:43 2010 New Revision: 77771 Log: Removed unneeded test. Modified: python/trunk/Lib/test/test_sys.py Modified: python/trunk/Lib/test/test_sys.py ============================================================================== --- python/trunk/Lib/test/test_sys.py (original) +++ python/trunk/Lib/test/test_sys.py Wed Jan 27 01:58:43 2010 @@ -206,7 +206,6 @@ def test_getwindowsversion(self): if hasattr(sys, "getwindowsversion"): v = sys.getwindowsversion() - self.assertTrue(isinstance(v[:], tuple)) self.assertEqual(len(v), 5) self.assertIsInstance(v[0], int) self.assertIsInstance(v[1], int)

1 0

r77770 - python/branches/release31-maint
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:56:56 2010 New Revision: 77770 Log: Blocked revisions 77769 via svnmerge ................ r77769 | eric.smith | 2010-01-26 19:56:30 -0500 (Tue, 26 Jan 2010) | 9 lines Merged revisions 77767 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77767 | eric.smith | 2010-01-26 19:55:16 -0500 (Tue, 26 Jan 2010) | 1 line Fix type on getwindowsversion documentation. Thanks Taggnostr. ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r77769 - in python/branches/py3k: Doc/library/sys.rst
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:56:30 2010 New Revision: 77769 Log: Merged revisions 77767 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77767 | eric.smith | 2010-01-26 19:55:16 -0500 (Tue, 26 Jan 2010) | 1 line Fix type on getwindowsversion documentation. Thanks Taggnostr. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/library/sys.rst Modified: python/branches/py3k/Doc/library/sys.rst ============================================================================== --- python/branches/py3k/Doc/library/sys.rst (original) +++ python/branches/py3k/Doc/library/sys.rst Wed Jan 27 01:56:30 2010 @@ -394,7 +394,7 @@ .. function:: getwindowsversion() - Return a named tuple containing describing the Windows version + Return a named tuple describing the Windows version currently running. The named elements are *major*, *minor*, *build*, *platform*, *service_pack*, *service_pack_minor*, *service_pack_major*, *suite_mask*, and *product_type*.

1 0

r77768 - python/branches/release26-maint
by eric.smith Jan. 27, 2010

Jan. 27, 2010

Author: eric.smith Date: Wed Jan 27 01:55:44 2010 New Revision: 77768 Log: Blocked revisions 77767 via svnmerge ........ r77767 | eric.smith | 2010-01-26 19:55:16 -0500 (Tue, 26 Jan 2010) | 1 line Fix type on getwindowsversion documentation. Thanks Taggnostr. ........ Modified: python/branches/release26-maint/ (props changed)

1 0