[Python-checkins] python/nondist/sandbox/datetime doc.txt,1.19,1.20

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Thu, 05 Dec 2002 21:21:04 -0800


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

Modified Files:
	doc.txt 
Log Message:
Fixed a typo, and lopped off parts of the datetime docs by referring to
the corresponding date docs.


Index: doc.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/doc.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** doc.txt	6 Dec 2002 05:13:40 -0000	1.19
--- doc.txt	6 Dec 2002 05:21:02 -0000	1.20
***************
*** 445,449 ****
      The DST flag is -1.   d.timetuple() is equivalent to
          (d.year, d.month, d.day,
!          d.hour, d.minute.d.second,
           d.weekday(),  # 0 is Monday
           d.toordinal() - date(d.year, 1, 1).toordinal() + 1, # day of year
--- 445,449 ----
      The DST flag is -1.   d.timetuple() is equivalent to
          (d.year, d.month, d.day,
!          d.hour, d.minute, d.second,
           d.weekday(),  # 0 is Monday
           d.toordinal() - date(d.year, 1, 1).toordinal() + 1, # day of year
***************
*** 451,488 ****
  
    - toordinal()
!     Return the proleptic Gregorian ordinal of the date, where January 1
!     of year 1 has ordinal 1.
  
    - weekday()
      Return the day of the week as an integer, where Monday is 0 and
!     Sunday is 6.  For example, datetime(2002, 12, 4).weekday() == 2, a
!     Wednesday.
      See also isoweekday().
  
    - isoweekday()
      Return the day of the week as an integer, where Monday is 1 and
!     Sunday is 7.  For example, datetime(2002, 12, 4).isoweekday() == 3, a
!     Wednesday.
      See also weekday() and isocalendar().
  
    - isocalendar()
!     Return a 3-tuple, (ISO year, ISO week number, ISO weekday).
! 
!     The ISO calendar is a widely used variant of the Gregorian calendar.
!     See <http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm>
!     for a good explanation.
! 
!     The ISO year consists of 52 or 53 full weeks, and where a week starts
!     on a Monday and ends on a Sunday.  The first week of an ISO year is
!     the first (Gregorian) calendar week of a year containing a Thursday.
!     This is called week number 1, and the ISO year of that Thursday is
!     the same as its Gregorian year.
! 
!     For example, 2004 begins on a Thursday, so the first week of ISO
!     year 2004 begins on Monday, 29 Dec 2003 and ends on Sunday, 4 Jan
!     2004, so that
! 
!     datetime(2003, 12, 29).isocalendar() == (2004, 1, 1)
!     datetime(2004, 1, 4).isocalendar() == (2004, 1, 7)
  
    XXX isoformat() needs work.
--- 451,470 ----
  
    - toordinal()
!     Return the proleptic Gregorian ordinal of the date.  The same as
!     date.toordinal().
  
    - weekday()
      Return the day of the week as an integer, where Monday is 0 and
!     Sunday is 6.  The same as date.weekday().
      See also isoweekday().
  
    - isoweekday()
      Return the day of the week as an integer, where Monday is 1 and
!     Sunday is 7.  The same as date.isoweekday().
      See also weekday() and isocalendar().
  
    - isocalendar()
!     Return a 3-tuple, (ISO year, ISO week number, ISO weekday).  The
!     same as date.isocalendar().
  
    XXX isoformat() needs work.