[Python-checkins] python/dist/src/Lib/test test_datetime.py,1.3,1.4

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv7218/python/Lib/test

Modified Files:
	test_datetime.py 
Log Message:
Changes sufficient so that pickles written by the Python implementation
can be read by the C implementation.  I don't really understand this.


Index: test_datetime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_datetime.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_datetime.py	20 Dec 2002 01:31:26 -0000	1.3
--- test_datetime.py	21 Dec 2002 05:04:42 -0000	1.4
***************
*** 39,42 ****
--- 39,46 ----
          return self.__dstoffset
  
+ class PicklableFixedOffset(FixedOffset):
+     def __init__(self, offset=None, name=None, dstoffset=None):
+         FixedOffset.__init__(self, offset, name, dstoffset)
+ 
  class TestTZInfo(unittest.TestCase):
  
***************
*** 91,97 ****
  
          # Make sure we can pickle/unpickle an instance of a subclass.
!         orig = FixedOffset(-300, 'cookie')
          self.failUnless(isinstance(orig, tzinfo))
!         self.failUnless(type(orig) is FixedOffset)
          self.assertEqual(orig.utcoffset(None), -300)
          self.assertEqual(orig.tzname(None), 'cookie')
--- 95,101 ----
  
          # Make sure we can pickle/unpickle an instance of a subclass.
!         orig = PicklableFixedOffset(-300, 'cookie')
          self.failUnless(isinstance(orig, tzinfo))
!         self.failUnless(type(orig) is PicklableFixedOffset)
          self.assertEqual(orig.utcoffset(None), -300)
          self.assertEqual(orig.tzname(None), 'cookie')
***************
*** 101,105 ****
                  derived = pickler.loads(green)
                  self.failUnless(isinstance(derived, tzinfo))
!                 self.failUnless(type(derived) is FixedOffset)
                  self.assertEqual(derived.utcoffset(None), -300)
                  self.assertEqual(derived.tzname(None), 'cookie')
--- 105,109 ----
                  derived = pickler.loads(green)
                  self.failUnless(isinstance(derived, tzinfo))
!                 self.failUnless(type(derived) is PicklableFixedOffset)
                  self.assertEqual(derived.utcoffset(None), -300)
                  self.assertEqual(derived.tzname(None), 'cookie')
***************
*** 1607,1611 ****
  
          # Try one with a tzinfo.
!         tinfo = FixedOffset(-300, 'cookie')
          orig = self.theclass(5, 6, 7, tzinfo=tinfo)
          state = orig.__getstate__()
--- 1611,1615 ----
  
          # Try one with a tzinfo.
!         tinfo = PicklableFixedOffset(-300, 'cookie')
          orig = self.theclass(5, 6, 7, tzinfo=tinfo)
          state = orig.__getstate__()
***************
*** 1613,1617 ****
          derived.__setstate__(state)
          self.assertEqual(orig, derived)
!         self.failUnless(isinstance(derived.tzinfo, FixedOffset))
          self.assertEqual(derived.utcoffset(), -300)
          self.assertEqual(derived.tzname(), 'cookie')
--- 1617,1621 ----
          derived.__setstate__(state)
          self.assertEqual(orig, derived)
!         self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
          self.assertEqual(derived.utcoffset(), -300)
          self.assertEqual(derived.tzname(), 'cookie')
***************
*** 1622,1626 ****
                  derived = pickler.loads(green)
                  self.assertEqual(orig, derived)
!                 self.failUnless(isinstance(derived.tzinfo, FixedOffset))
                  self.assertEqual(derived.utcoffset(), -300)
                  self.assertEqual(derived.tzname(), 'cookie')
--- 1626,1631 ----
                  derived = pickler.loads(green)
                  self.assertEqual(orig, derived)
!                 self.failUnless(isinstance(derived.tzinfo,
!                                 PicklableFixedOffset))
                  self.assertEqual(derived.utcoffset(), -300)
                  self.assertEqual(derived.tzname(), 'cookie')
***************
*** 1768,1772 ****
  
          # Try one with a tzinfo.
!         tinfo = FixedOffset(-300, 'cookie')
          orig = self.theclass(*args, **{'tzinfo': tinfo})
          state = orig.__getstate__()
--- 1773,1777 ----
  
          # Try one with a tzinfo.
!         tinfo = PicklableFixedOffset(-300, 'cookie')
          orig = self.theclass(*args, **{'tzinfo': tinfo})
          state = orig.__getstate__()
***************
*** 1774,1778 ****
          derived.__setstate__(state)
          self.assertEqual(orig, derived)
!         self.failUnless(isinstance(derived.tzinfo, FixedOffset))
          self.assertEqual(derived.utcoffset(), -300)
          self.assertEqual(derived.tzname(), 'cookie')
--- 1779,1783 ----
          derived.__setstate__(state)
          self.assertEqual(orig, derived)
!         self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
          self.assertEqual(derived.utcoffset(), -300)
          self.assertEqual(derived.tzname(), 'cookie')
***************
*** 1783,1787 ****
                  derived = pickler.loads(green)
                  self.assertEqual(orig, derived)
!                 self.failUnless(isinstance(derived.tzinfo, FixedOffset))
                  self.assertEqual(derived.utcoffset(), -300)
                  self.assertEqual(derived.tzname(), 'cookie')
--- 1788,1793 ----
                  derived = pickler.loads(green)
                  self.assertEqual(orig, derived)
!                 self.failUnless(isinstance(derived.tzinfo,
!                                 PicklableFixedOffset))
                  self.assertEqual(derived.utcoffset(), -300)
                  self.assertEqual(derived.tzname(), 'cookie')