[Python-checkins] python/nondist/sandbox/datetime datetime.c,1.20,1.21

[tim_one@users.sourceforge.net]

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

Modified Files:
	datetime.c 
Log Message:
ord_to_ymd():  Removed the
    expr ? 1 : 0
business from more expressions expr that return 0 or 1 already.


Index: datetime.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/datetime.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** datetime.c	21 Nov 2002 23:12:56 -0000	1.20
--- datetime.c	21 Nov 2002 23:15:43 -0000	1.21
***************
*** 157,165 ****
  		return;
  	}
! 	leapyear = (n1 == 3 && (n4 != 24 || n100 == 3)) ? 1 : 0;
  	assert(leapyear == is_leap(*year));
  	*month = (n + 50) >> 5;
! 	preceding = (_days_before_month[*month]
! 		     + ((*month > 2 && leapyear) ? 1 : 0));
  	if (preceding > n) {
  		/* estimate is too large */
--- 157,164 ----
  		return;
  	}
! 	leapyear = n1 == 3 && (n4 != 24 || n100 == 3);
  	assert(leapyear == is_leap(*year));
  	*month = (n + 50) >> 5;
! 	preceding = (_days_before_month[*month] + (*month > 2 && leapyear));
  	if (preceding > n) {
  		/* estimate is too large */