diff options
author | Tim Peters <tim.peters@gmail.com> | 2003-01-10 03:49:02 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2003-01-10 03:49:02 (GMT) |
commit | 37f398282bf74b11e6167f7c7af75960e553dab9 (patch) | |
tree | afcec2dd5f514160881b45747b76d28704a32c9f /Lib | |
parent | a5e8bb94e56bf5f1e304064c8f9dc96e87980326 (diff) | |
download | cpython-37f398282bf74b11e6167f7c7af75960e553dab9.zip cpython-37f398282bf74b11e6167f7c7af75960e553dab9.tar.gz cpython-37f398282bf74b11e6167f7c7af75960e553dab9.tar.bz2 |
Got rid of the timetz type entirely. This was a bit trickier than I
hoped it would be, but not too bad. A test had to change:
time.__setstate__() can no longer add a non-None tzinfo member to a time
object that didn't already have one, since storage for a tzinfo member
doesn't exist in that case.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_datetime.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index 614fed6..0cda5d0 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -1857,7 +1857,7 @@ class TestTimeTZ(TestTime, TZInfoBase): tinfo = PicklableFixedOffset(-300, 'cookie') orig = self.theclass(5, 6, 7, tzinfo=tinfo) state = orig.__getstate__() - derived = self.theclass() + derived = self.theclass(tzinfo=FixedOffset(0, "UTC", 0)) derived.__setstate__(state) self.assertEqual(orig, derived) self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset)) |