[Python-checkins] r81619 - in python/branches/release31-maint: Lib/test/test_datetime.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Mon May 31 18:11:21 2010
New Revision: 81619

Log:
Merged revisions 81556 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81556 | alexander.belopolsky | 2010-05-26 16:00:12 -0400 (Wed, 26 May 2010) | 10 lines
  
  Merged revisions 81555 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81555 | alexander.belopolsky | 2010-05-26 15:43:16 -0400 (Wed, 26 May 2010) | 3 lines
    
    Issue #7879: Do not test negative timestamps on any Windows platform
    including Windows CE.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_datetime.py

Modified: python/branches/release31-maint/Lib/test/test_datetime.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_datetime.py	(original)
+++ python/branches/release31-maint/Lib/test/test_datetime.py	Mon May 31 18:11:21 2010
@@ -3,7 +3,7 @@
 See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
 """
 
-import os
+import sys
 import pickle
 import unittest
 
@@ -1496,7 +1496,7 @@
 
     def test_negative_float_fromtimestamp(self):
         # Windows doesn't accept negative timestamps
-        if os.name == "nt":
+        if sys.platform == "win32":
             return
         # The result is tz-dependent; at least test that this doesn't
         # fail (like it did before bug 1646728 was fixed).
@@ -1504,7 +1504,7 @@
 
     def test_negative_float_utcfromtimestamp(self):
         # Windows doesn't accept negative timestamps
-        if os.name == "nt":
+        if sys.platform == "win32":
             return
         d = self.theclass.utcfromtimestamp(-1.05)
         self.assertEquals(d, self.theclass(1969, 12, 31, 23, 59, 58, 950000))