[Python-checkins] python/dist/src/Lib/test test_datetime.py,1.31,1.32

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
2003年1月31日 13:55:36 -0800

• Previous message: [Python-checkins] python/nondist/sandbox/datetime datetime.py,1.155,1.156 test_datetime.py,1.108,1.109
• Next message: [Python-checkins] python/nondist/peps pep-0305.txt,1.8,1.9
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv11764/Lib/test
Modified Files:
	test_datetime.py 
Log Message:
Changed the tests to stop using __setstate__(). __setstate__() no
longer needs to be public, and shoudn't be public because all datetime
objects are immutable. The Python implementation has changed
accordingly, but still need to change the C implementation.
Index: test_datetime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_datetime.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** test_datetime.py	30 Jan 2003 22:06:23 -0000	1.31
--- test_datetime.py	31 Jan 2003 21:55:33 -0000	1.32
***************
*** 281,291 ****
 state = orig.__getstate__()
 self.assertEqual(args, state)
- derived = timedelta()
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_compare(self):
--- 281,288 ----
 state = orig.__getstate__()
 self.assertEqual(args, state)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_compare(self):
***************
*** 838,848 ****
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17',), self.theclass)
- derived = self.theclass(1, 1, 1)
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_compare(self):
--- 835,842 ----
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17',), self.theclass)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_compare(self):
***************
*** 1195,1205 ****
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17\x14\x3b\x01\x00\x10\x00',))
- derived = self.theclass(1, 1, 1)
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_more_compare(self):
--- 1189,1196 ----
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17\x14\x3b\x01\x00\x10\x00',))
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_more_compare(self):
***************
*** 1579,1589 ****
 state = orig.__getstate__()
 self.assertEqual(state, ('\x14\x3b\x10\x00\x10\x00',))
- derived = self.theclass()
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_bool(self):
--- 1570,1577 ----
 state = orig.__getstate__()
 self.assertEqual(state, ('\x14\x3b\x10\x00\x10\x00',))
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 def test_bool(self):
***************
*** 1892,1922 ****
 state = orig.__getstate__()
 self.assertEqual(state, ('\x14\x3b\x10\x00\x10\x00',))
- derived = self.theclass()
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 # Try one with a tzinfo.
 tinfo = PicklableFixedOffset(-300, 'cookie')
 orig = self.theclass(5, 6, 7, tzinfo=tinfo)
- state = orig.__getstate__()
- derived = self.theclass(tzinfo=FixedOffset(0, "UTC", 0))
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
- self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
- self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
- self.assertEqual(derived.tzname(), 'cookie')
- 
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
! self.failUnless(isinstance(derived.tzinfo,
! PicklableFixedOffset))
! self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
! self.assertEqual(derived.tzname(), 'cookie')
 
 def test_more_bool(self):
--- 1880,1898 ----
 state = orig.__getstate__()
 self.assertEqual(state, ('\x14\x3b\x10\x00\x10\x00',))
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 # Try one with a tzinfo.
 tinfo = PicklableFixedOffset(-300, 'cookie')
 orig = self.theclass(5, 6, 7, tzinfo=tinfo)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
! self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
! self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
! self.assertEqual(derived.tzname(), 'cookie')
 
 def test_more_bool(self):
***************
*** 2107,2137 ****
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17\x14\x3b\x01\x00\x10\x00',))
- derived = self.theclass(1, 1, 1)
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 # Try one with a tzinfo.
 tinfo = PicklableFixedOffset(-300, 'cookie')
 orig = self.theclass(*args, **{'tzinfo': tinfo})
- state = orig.__getstate__()
 derived = self.theclass(1, 1, 1, tzinfo=FixedOffset(0, "", 0))
- derived.__setstate__(state)
- self.assertEqual(orig, derived)
- self.failUnless(isinstance(derived.tzinfo, PicklableFixedOffset))
- self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
- self.assertEqual(derived.tzname(), 'cookie')
- 
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
! self.failUnless(isinstance(derived.tzinfo,
! PicklableFixedOffset))
! self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
! self.assertEqual(derived.tzname(), 'cookie')
 
 def test_extreme_hashes(self):
--- 2083,2103 ----
 state = orig.__getstate__()
 self.assertEqual(state, ('\x00\x06\x07\x17\x14\x3b\x01\x00\x10\x00',))
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
 
 # Try one with a tzinfo.
 tinfo = PicklableFixedOffset(-300, 'cookie')
 orig = self.theclass(*args, **{'tzinfo': tinfo})
 derived = self.theclass(1, 1, 1, tzinfo=FixedOffset(0, "", 0))
 for pickler, unpickler, proto in pickle_choices:
! green = pickler.dumps(orig, proto)
! derived = unpickler.loads(green)
! self.assertEqual(orig, derived)
! self.failUnless(isinstance(derived.tzinfo,
! PicklableFixedOffset))
! self.assertEqual(derived.utcoffset(), timedelta(minutes=-300))
! self.assertEqual(derived.tzname(), 'cookie')
 
 def test_extreme_hashes(self):

---

• Previous message: [Python-checkins] python/nondist/sandbox/datetime datetime.py,1.155,1.156 test_datetime.py,1.108,1.109
• Next message: [Python-checkins] python/nondist/peps pep-0305.txt,1.8,1.9
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]