diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-31 16:11:21 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-05-31 16:11:21 (GMT) |
| commit | 2f4087d7139faaea4050810add0872c3deff7447 (patch) | |
| tree | b11bc14a508e0669b801fbfc3c432d9285026d45 /Lib/test/test_datetime.py | |
| parent | 53d7c14bf9eda53a305518e9ca1a3ded2a8f5b07 (diff) | |
| download | cpython-2f4087d7139faaea4050810add0872c3deff7447.zip cpython-2f4087d7139faaea4050810add0872c3deff7447.tar.gz cpython-2f4087d7139faaea4050810add0872c3deff7447.tar.bz2 | |
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.
........
................
Diffstat (limited to 'Lib/test/test_datetime.py')
| -rw-r--r-- | Lib/test/test_datetime.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index ead8d70..a971c68 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -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 @@ class TestDateTime(TestDate): 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 @@ class TestDateTime(TestDate): 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)) |