Update of /cvsroot/warp-framework/warp_framework/properties
In directory usw-pr-cvs1:/tmp/cvs-serv29905/warp_framework/properties
Modified Files:
Tag: interra
__init__.py internal_converters.py
Log Message:
Adding Time property (in addition to date-time) to specify timeintervals (duration of event, for instance)
Index: __init__.py
===================================================================
RCS file: /cvsroot/warp-framework/warp_framework/properties/__init__.py,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** __init__.py 7 Dec 2001 12:32:09 -0000 1.15
--- __init__.py 18 Jul 2002 23:31:58 -0000 1.15.2.1
***************
*** 92,93 ****
--- 92,94 ----
from range import range_factory
from order import order_factory
+ from time import time_factory
\ No newline at end of file
Index: internal_converters.py
===================================================================
RCS file: /cvsroot/warp-framework/warp_framework/properties/internal_converters.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** internal_converters.py 8 Nov 2001 04:32:16 -0000 1.6
--- internal_converters.py 18 Jul 2002 23:31:58 -0000 1.6.2.1
***************
*** 68,71 ****
--- 68,72 ----
import string
from DateTime import DateTime
+ from time import Time
class invalid_float_exception(ValueError):
***************
*** 115,121 ****
def datetime(year=None, month=None, day=None, hour=None, minute=None):
! if year is None:
! raise ValueError
! year = year
month = month or 1
day = day or 1
--- 116,122 ----
def datetime(year=None, month=None, day=None, hour=None, minute=None):
! # if year is None:
! # raise ValueError
! year = year or 1
month = month or 1
day = day or 1
***************
*** 125,126 ****
--- 126,133 ----
return DateTime("%s-%s-%s %s:%s" % \
(year, month, day, hour, minute))
+
+ def time(hour=None, minute=None, second=None):
+ hour = integer(hour or 0)
+ minute = integer(minute or 0)
+ second = integer(second or 0)
+ return Time(hour*3600 + minute*60 + second)
|
