From c7886015727324d579c2f41b3d4fc5261055146f Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 3 Aug 2012 10:23:16 -0700 Subject: [PATCH] fix pretty_datetime helper --- edbob/pyramid/forms/formalchemy/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edbob/pyramid/forms/formalchemy/__init__.py b/edbob/pyramid/forms/formalchemy/__init__.py index 77cd0b4..9b02cdc 100644 --- a/edbob/pyramid/forms/formalchemy/__init__.py +++ b/edbob/pyramid/forms/formalchemy/__init__.py @@ -37,9 +37,9 @@ from webhelpers.html.tags import literal import formalchemy from formalchemy.validators import accepts_none -import edbob from edbob.lib import pretty from edbob.pyramid import Session, helpers +from edbob.time import localize from edbob.pyramid.forms.formalchemy.fieldset import * from edbob.pyramid.forms.formalchemy.grid import * @@ -114,7 +114,7 @@ def pretty_datetime(value, from_='local', to='local'): if not isinstance(value, datetime.datetime): return str(value) if value else '' if not value.tzinfo: - value = edbob.local_time(value, from_=from_, to=to) + value = localize(value, from_=from_, to=to) return literal('%s' % ( value.strftime('%Y-%m-%d %H:%M:%S %Z%z'), pretty.date(value)))