openstack/deb-python-wsme
Code Issues Proposed changes

Fix parse_[date][time] that were using the Invalid exception from formencode

Browse Source
This commit is contained in:
Christophe de Vienne
2011-11-07 11:10:00 +01:00
parent e51a406912
commit 54d7457583
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wsme/utils.py
View File

@@ -16,23 +16,20 @@ time_re = re.compile(time_re)
def parse_isodate(value): def parse_isodate(value):
m = date_re.match(value) m = date_re.match(value)
if m is None: if m is None:
raise validators.Invalid("%s is not a legal date value" % (value), raise ValueError("'%s' is not a legal date value" % (value))
value, None)
try: try:
return datetime.date( return datetime.date(
int(m.group('year')), int(m.group('year')),
int(m.group('month')), int(m.group('month')),
int(m.group('day'))) int(m.group('day')))
except ValueError, e: except ValueError, e:
raise validators.Invalid("%s is a out-of-range date" % (value), raise ValueError("'%s' is a out-of-range date" % (value))
value, None)
def parse_isotime(value): def parse_isotime(value):
m = time_re.match(value) m = time_re.match(value)
if m is None: if m is None:
raise validators.Invalid("%s is not a legal time value" % (value), raise ValueError("'%s' is not a legal time value" % (value))
value, None)
try: try:
ms = 0 ms = 0
if m.group('sec_frac') is not None: if m.group('sec_frac') is not None:
@@ -45,16 +42,14 @@ def parse_isotime(value):
int(m.group('sec')), int(m.group('sec')),
ms) ms)
except ValueError, e: except ValueError, e:
raise validators.Invalid("%s is a out-of-range time" % (value), raise ValueError("'%s' is a out-of-range time" % (value))
value, None)
# TODO handle timezone # TODO handle timezone
def parse_isodatetime(value): def parse_isodatetime(value):
m = datetime_re.match(value) m = datetime_re.match(value)
if m is None: if m is None:
raise validators.Invalid("%s is not a legal datetime value" % (value), raise ValueError("'%s' is not a legal datetime value" % (value))
value, None)
try: try:
ms = 0 ms = 0
if m.group('sec_frac') is not None: if m.group('sec_frac') is not None:
@@ -70,5 +65,4 @@ def parse_isodatetime(value):
int(m.group('sec')), int(m.group('sec')),
ms) ms)
except ValueError, e: except ValueError, e:
raise validators.Invalid("%s is a out-of-range datetime" % (value), raise ValueError("'%s' is a out-of-range datetime" % (value))
value, None)