summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-12-26 05:01:19 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-12-26 05:01:19 (GMT)
commit4c0db788e2500ca2140633d24b0c1c6c6d277a92 (patch)
treeeb58107486fd2bb3a6cb281ba739742ec57d960d /Lib
parent89825958705d1aaf2aa7cdf96f79d2f292f3274c (diff)
downloadcpython-4c0db788e2500ca2140633d24b0c1c6c6d277a92.zip
cpython-4c0db788e2500ca2140633d24b0c1c6c6d277a92.tar.gz
cpython-4c0db788e2500ca2140633d24b0c1c6c6d277a92.tar.bz2
Added tests to ensure that timetz comparison, and datetimetz
subtraction, work as documented. In the Python implementation, they weren't calling utcoffset() if both operands had the same tzinfo object. That's fine if it so happens that the shared tzinfo object returns a fixed offset (independent of operand), but can give wrong results if that's not so, and the latter obtains in a tzinfo subclass instance trying to model both standard and daylight times. The C implementation was already doing this "correctly", so we're just adding tests to verify it.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_datetime.py76
1 files changed, 67 insertions, 9 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index de0d17a..a65e41c 100644
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -1654,6 +1654,37 @@ class TZInfoBase(unittest.TestCase):
self.assertRaises(ValueError, t.utcoffset)
self.assertRaises(ValueError, t.dst)
+ def test_aware_compare(self):
+ cls = self.theclass
+
+ # Primarily trying to ensure that utcoffset() gets called even if
+ # the comparands have the same tzinfo member. timetz comparison
+ # didn't used to do so, although datetimetz comparison did.
+ class OperandDependentOffset(tzinfo):
+ def utcoffset(self, t):
+ if t.minute < 10:
+ return t.minute # d0 and d1 equal after adjustment
+ else:
+ return 59 # d2 off in the weeds
+
+ base = cls(8, 9, 10, tzinfo=OperandDependentOffset())
+ d0 = base.replace(minute=3)
+ d1 = base.replace(minute=9)
+ d2 = base.replace(minute=11)
+ for x in d0, d1, d2:
+ for y in d0, d1, d2:
+ got = cmp(x, y)
+ if (x is d0 or x is d1) and (y is d0 or y is d1):
+ expected = 0
+ elif x is y is d2:
+ expected = 0
+ elif x is d2:
+ expected = -1
+ else:
+ assert y is d2
+ expected = 1
+ self.assertEqual(got, expected)
+
class TestTimeTZ(TestTime, TZInfoBase):
theclass = timetz
@@ -1862,6 +1893,7 @@ class TestTimeTZ(TestTime, TZInfoBase):
self.assertRaises(ValueError, base.replace, second=100)
self.assertRaises(ValueError, base.replace, microsecond=1000000)
+
class TestDateTimeTZ(TestDateTime, TZInfoBase):
theclass = datetimetz
@@ -2043,8 +2075,7 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase):
now = self.theclass.now()
tz55 = FixedOffset(-330, "west 5:30")
- timeaware = timetz(now.hour, now.minute, now.second,
- now.microsecond, tzinfo=tz55)
+ timeaware = now.timetz().replace(tzinfo=tz55)
nowaware = self.theclass.combine(now.date(), timeaware)
self.failUnless(nowaware.tzinfo is tz55)
self.assertEqual(nowaware.timetz(), timeaware)
@@ -2080,13 +2111,8 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase):
# Make up a random timezone.
tzr = FixedOffset(random.randrange(-1439, 1440), "randomtimezone")
- # Attach it to nowawareplus -- this is clumsy.
- nowawareplus = self.theclass.combine(nowawareplus.date(),
- timetz(nowawareplus.hour,
- nowawareplus.minute,
- nowawareplus.second,
- nowawareplus.microsecond,
- tzinfo=tzr))
+ # Attach it to nowawareplus.
+ nowawareplus = nowawareplus.replace(tzinfo=tzr)
self.failUnless(nowawareplus.tzinfo is tzr)
# Make sure the difference takes the timezone adjustments into account.
got = nowaware - nowawareplus
@@ -2360,6 +2386,38 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase):
self.failUnless(got.tzinfo is expected.tzinfo)
self.assertEqual(got, expected)
+ def test_aware_subtract(self):
+ cls = self.theclass
+
+ # Primarily trying to ensure that utcoffset() gets called even if
+ # the operands have the same tzinfo member. Subtraction didn't
+ # used to do this, and it makes a difference for DST-aware tzinfo
+ # instances.
+ class OperandDependentOffset(tzinfo):
+ def utcoffset(self, t):
+ if t.minute < 10:
+ return t.minute # d0 and d1 equal after adjustment
+ else:
+ return 59 # d2 off in the weeds
+
+ base = cls(8, 9, 10, 11, 12, 13, 14, tzinfo=OperandDependentOffset())
+ d0 = base.replace(minute=3)
+ d1 = base.replace(minute=9)
+ d2 = base.replace(minute=11)
+ for x in d0, d1, d2:
+ for y in d0, d1, d2:
+ got = x - y
+ if (x is d0 or x is d1) and (y is d0 or y is d1):
+ expected = timedelta(0)
+ elif x is y is d2:
+ expected = timedelta(0)
+ elif x is d2:
+ expected = timedelta(minutes=(11-59)-0)
+ else:
+ assert y is d2
+ expected = timedelta(minutes=0-(11-59))
+ self.assertEqual(got, expected)
+
def test_suite():
allsuites = [unittest.makeSuite(klass, 'test')