From 6ce9a0a961bce251fa946a7af4294b3b1c6a93f3 Mon Sep 17 00:00:00 2001 From: Toby Date: Thu, 10 May 2012 10:07:28 +0100 Subject: [PATCH] remove lib.helper dependency for model --- ckan/model/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ckan/model/__init__.py b/ckan/model/__init__.py index 0325131a08c..20ce85531fb 100644 --- a/ckan/model/__init__.py +++ b/ckan/model/__init__.py @@ -7,6 +7,7 @@ import vdm.sqlalchemy from vdm.sqlalchemy.base import SQLAlchemySession from sqlalchemy import MetaData, __version__ as sqav, Table +from sqlalchemy.util import OrderedDict import meta #from domain_object import DomainObjectOperation @@ -30,7 +31,6 @@ import term_translation import ckan.migration -import ckan.lib.helpers as h log = logging.getLogger(__name__) @@ -437,13 +437,13 @@ def _get_revision_user(self): def revision_as_dict(revision, include_packages=True, include_groups=True, ref_package_by='name'): - revision_dict = h.OrderedDict(( + revision_dict = OrderedDict(( ('id', revision.id), - ('timestamp', h.datetime_to_date_str(revision.timestamp)), + ('timestamp', revision.timestamp.isoformat()), ('message', revision.message), ('author', revision.author), ('approved_timestamp', - h.datetime_to_date_str(revision.approved_timestamp) \ + revision.approved_timestamp.isoformat() \ if revision.approved_timestamp else None), )) if include_packages: