[ckan-changes] commit/ckan: dread: [controllers, lib, model][xs]: #1325 Fixes to become compatible with python 2.5.
Bitbucket
commits-noreply at bitbucket.org
Fri Sep 9 16:47:04 UTC 2011
1 new changeset in ckan:
http://bitbucket.org/okfn/ckan/changeset/0dd4d4457c97/
changeset: 0dd4d4457c97
branch: release-v1.4.3
user: dread
date: 2011-09-09 18:40:06
summary: [controllers,lib,model][xs]: #1325 Fixes to become compatible with python 2.5.
affected #: 4 files (139 bytes)
--- a/ckan/controllers/package.py Fri Sep 09 12:49:38 2011 +0100
+++ b/ckan/controllers/package.py Fri Sep 09 17:40:06 2011 +0100
@@ -1,7 +1,6 @@
import logging
import urlparse
from urllib import urlencode
-import json
import datetime
import re
@@ -24,6 +23,7 @@
from ckan.lib.cache import proxy_cache
from ckan.lib.package_saver import PackageSaver, ValidationException
from ckan.lib.navl.dictization_functions import DataError, unflatten, validate
+from ckan.lib.helpers import json
from ckan.logic import NotFound, NotAuthorized, ValidationError
from ckan.logic import tuplize_dict, clean_dict, parse_params, flatten_to_string_key
from ckan.plugins import PluginImplementations, IPackageController
--- a/ckan/lib/dictization/model_dictize.py Fri Sep 09 12:49:38 2011 +0100
+++ b/ckan/lib/dictization/model_dictize.py Fri Sep 09 17:40:06 2011 +0100
@@ -7,7 +7,7 @@
table_dictize)
from ckan.logic import NotFound
import ckan.misc
-import json
+from ckan.lib.helpers import json
## package save
--- a/ckan/lib/dictization/model_save.py Fri Sep 09 12:49:38 2011 +0100
+++ b/ckan/lib/dictization/model_save.py Fri Sep 09 17:40:06 2011 +0100
@@ -1,6 +1,6 @@
from ckan.lib.dictization import table_dict_save
from sqlalchemy.orm import class_mapper
-import json
+from ckan.lib.helpers import json
##package saving
--- a/ckan/model/__init__.py Fri Sep 09 12:49:38 2011 +0100
+++ b/ckan/model/__init__.py Fri Sep 09 17:40:06 2011 +0100
@@ -1,3 +1,4 @@
+from __future__ import with_statement # necessary for python 2.5 support
import warnings
from pylons import config
from sqlalchemy import MetaData, __version__ as sqav
Repository URL: https://bitbucket.org/okfn/ckan/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the ckan-changes
mailing list