Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv32487
Modified Files:
time.java
Log Message:
mktime(): Use te DST flag. See test311.py
Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** time.java 2001/07/29 17:13:46 2.15
--- time.java 2001/08/05 10:01:50 2.16
***************
*** 234,237 ****
--- 234,242 ----
throw e;
}
+ int dst = item(tup, 8);
+ if (dst == 0 || dst == 1) {
+ cal.set(Calendar.DST_OFFSET,
+ dst * cal.getTimeZone().getDSTSavings());
+ }
return (double)cal.getTime().getTime()/1000.0;
}
|
