Changeset 321

Show
Ignore:
Timestamp:
04/01/08 00:14:12 (8 months ago)
Author:
johnbywater
Message:

Added convertor for RDate dom attribute, added tests for all convertors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/dm/datetimeconvertor.py

    r310 r321  
    11import mx.DateTime 
    22import datetime 
     3import sre 
    34 
    45class DateTimeConvertor(object):   
    …… 
    3031        ) 
    3132 
     33 
    3234class DateConvertor(object):   
    3335    "Converts between HTML (string) and python (mx.DateTime.Date)." 
    …… 
    5759        ) 
    5860 
     61 
    5962class RDateConvertor(object):   
    6063    "Converts between HTML (string) and python (mx.DateTime.Date)." 
    …… 
    6568            return None 
    6669        elif dateHtml.__class__ == "".__class__: 
    67             day, month, year = [int(i) for i in dateHtml.split('-')] 
     70            rdate = sre.compile('(\d\d)-(\d\d)-(\d\d\d\d)') 
     71            date = sre.compile('(\d\d\d\d)-(\d\d)-(\d\d)') 
     72            rres = rdate.match(dateHtml) 
     73            res = date.match(dateHtml) 
     74            if rres: 
     75                day, month, year = [int(i) for i in rres.groups()] 
     76            elif res: 
     77                year, month, day = [int(i) for i in res.groups()] 
     78            else: 
     79                raise Exception, "Couldn't accept '%s' for an RDate."  
    6880        elif dateHtml.__class__ == datetime.date: 
    6981            day, month, year = dateHtml.day, dateHtml.month, dateHtml.year 

  • trunk/src/dm/test.py

    r308 r321  
    2020import dm.djangotest 
    2121import dm.pylonstest 
     22import dm.datetimeconvertortest 
    2223from dm.testunit import ApplicationTestSuite 
    2324