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

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Mon May 31 18:00:34 2010
New Revision: 81618

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_datetime.py

Modified: python/branches/release26-maint/Lib/test/test_datetime.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_datetime.py	(original)
+++ python/branches/release26-maint/Lib/test/test_datetime.py	Mon May 31 18:00:34 2010
@@ -3,7 +3,7 @@
 See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
 """
 
-import os
+import sys
 import pickle
 import cPickle
 import unittest
@@ -1503,7 +1503,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).
@@ -1511,7 +1511,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))