summaryrefslogtreecommitdiff
path: root/webob/datetime_utils.py
diff options
context:
space:
mode:
authorSergey Schetinin <sergey@maluke.com>2010-08-11 03:43:05 +0300
committerSergey Schetinin <sergey@maluke.com>2010-08-11 03:43:05 +0300
commitd114444dd97e2b8a7789d41a8d785aa7fe8dda29 (patch)
tree074774e7ef3eebd8b1ec41c092f4eadc34fdc0dc /webob/datetime_utils.py
parent895499c3c545905d5cc969c771f79d6c1b759d73 (diff)
downloadwebob-d114444dd97e2b8a7789d41a8d785aa7fe8dda29.tar.gz
* fix a couple missed renames
* move all the `if not value: return None` from the serializers to converter.__set__
Diffstat (limited to 'webob/datetime_utils.py')
-rw-r--r--webob/datetime_utils.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/webob/datetime_utils.py b/webob/datetime_utils.py
index 987032e..12fe27d 100644
--- a/webob/datetime_utils.py
+++ b/webob/datetime_utils.py
@@ -54,8 +54,6 @@ def parse_date(value):
return datetime.fromtimestamp(t, UTC)
def serialize_date(dt):
- if dt is None:
- return None
if isinstance(dt, unicode):
dt = dt.encode('ascii')
if isinstance(dt, str):
@@ -72,8 +70,6 @@ def serialize_date(dt):
return formatdate(dt)
def serialize_cookie_date(dt):
- if dt is None:
- return None
if isinstance(dt, unicode):
dt = dt.encode('ascii')
if isinstance(dt, timedelta):
@@ -84,23 +80,22 @@ def serialize_cookie_date(dt):
def parse_date_delta(value):
"""
- like _parse_date, but also handle delta seconds
+ like parse_date, but also handle delta seconds
"""
if not value:
return None
try:
value = int(value)
except ValueError:
- pass
+ return parse_date(value)
else:
delta = timedelta(seconds=value)
return datetime.now() + delta
- return _parse_date(value)
+
def serialize_date_delta(value):
- if not value and value != 0:
- return None
if isinstance(value, (float, int)):
return str(int(value))
- return _serialize_date(value)
+ else:
+ return serialize_date(value)