[Python-checkins] CVS: python/nondist/sandbox/datetime datetime.py,1.25,1.26 test_datetime.py,1.17,1.18

[Guido van Rossum]

Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory usw-pr-cvs1:/tmp/cvs-serv9873

Modified Files:
	datetime.py test_datetime.py 
Log Message:
Of course, isocalendar() should return 1-7 for the weekday too.


Index: datetime.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/datetime.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** datetime.py	3 Mar 2002 20:43:49 -0000	1.25
--- datetime.py	3 Mar 2002 20:52:29 -0000	1.26
***************
*** 650,654 ****
          from that.
  
!         Note that the first week is 1, but Monday is 0.
  
          ISO calendar algorithm taken from
--- 650,654 ----
          from that.
  
!         The first week is 1; Monday is 1 ... Sunday is 7.
  
          ISO calendar algorithm taken from
***************
*** 668,672 ****
                  year += 1
                  week = 0
!         return year, week+1, day
  
  
--- 668,672 ----
                  year += 1
                  week = 0
!         return year, week+1, day+1
  
  

Index: test_datetime.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/test_datetime.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_datetime.py	3 Mar 2002 20:45:12 -0000	1.17
--- test_datetime.py	3 Mar 2002 20:52:29 -0000	1.18
***************
*** 244,258 ****
          for i in range(7):
              d = datetime(2003, 12, 22+i)
!             self.assertEqual(d.isocalendar(), (2003, 52, i))
              d = datetime(2003, 12, 29) + timedelta(i)
!             self.assertEqual(d.isocalendar(), (2004, 1, i))
              d = datetime(2004, 1, 5+i)
!             self.assertEqual(d.isocalendar(), (2004, 2, i))
              d = datetime(2009, 12, 21+i)
!             self.assertEqual(d.isocalendar(), (2009, 52, i))
              d = datetime(2009, 12, 28) + timedelta(i)
!             self.assertEqual(d.isocalendar(), (2009, 53, i))
              d = datetime(2010, 1, 4+i)
!             self.assertEqual(d.isocalendar(), (2010, 1, i))
  
      def test_iso_long_years(self):
--- 244,258 ----
          for i in range(7):
              d = datetime(2003, 12, 22+i)
!             self.assertEqual(d.isocalendar(), (2003, 52, i+1))
              d = datetime(2003, 12, 29) + timedelta(i)
!             self.assertEqual(d.isocalendar(), (2004, 1, i+1))
              d = datetime(2004, 1, 5+i)
!             self.assertEqual(d.isocalendar(), (2004, 2, i+1))
              d = datetime(2009, 12, 21+i)
!             self.assertEqual(d.isocalendar(), (2009, 52, i+1))
              d = datetime(2009, 12, 28) + timedelta(i)
!             self.assertEqual(d.isocalendar(), (2009, 53, i+1))
              d = datetime(2010, 1, 4+i)
!             self.assertEqual(d.isocalendar(), (2010, 1, i+1))
  
      def test_iso_long_years(self):