Update of /cvsroot/jtoolkit/jToolkit/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32290
Modified Files:
dates.py
Log Message:
adjusted pgdateparseformat so time zone is optional, handle pure times properly in dateparser
Index: dates.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/data/dates.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dates.py 9 Feb 2004 12:33:09 -0000 1.5
--- dates.py 9 Feb 2004 13:22:43 -0000 1.6
***************
*** 135,139 ****
nosepdateparseformat = "(?P<Y>\d{4})(?P<M>\d{2})(?P<D>\d{2})(?P<h>\d{2})(?P<m>\d{2})(?P<s>\d{2})"
# yyyy-mm-dd hh:mi:ss+TZ
! pgdateparseformat = "(?P<Y>\d{4})-(?P<M>\d{2})-(?P<D>\d{2}) (?P<h>\d{2}):(?P<m>\d{2}):(?P<s>\d{2})[+-]\d{2}"
# standard parsers
stddateparser = dateparser(stddateparseformat)
--- 135,139 ----
nosepdateparseformat = "(?P<Y>\d{4})(?P<M>\d{2})(?P<D>\d{2})(?P<h>\d{2})(?P<m>\d{2})(?P<s>\d{2})"
# yyyy-mm-dd hh:mi:ss+TZ
! pgdateparseformat = "(?P<Y>\d{4})-(?P<M>\d{2})-(?P<D>\d{2}) (?P<h>\d{2}):(?P<m>\d{2}):(?P<s>\d{2})([+-]\d{2}|)"
# standard parsers
stddateparser = dateparser(stddateparseformat)
***************
*** 159,162 ****
--- 159,165 ----
else:
timevalue = time.strptime(value, formattype)
+ # handle pure times properly (otherwise you get a range error from mxDateTime because of zero day)
+ if timevalue[2] == 0:
+ timevalue = timevalue[:2] + (1,) + timevalue[3:]
return apply(date, timevalue[:6])
except ValueError:
|
