From c5f44bc5707268aa58d0c11121147cf661384ee2 Mon Sep 17 00:00:00 2001 From: Toby Date: Thu, 29 Mar 2012 14:18:32 +0100 Subject: [PATCH] more cleans for model/license --- ckan/model/license.py | 352 +++++++++++++++++++++--------------------- 1 file changed, 177 insertions(+), 175 deletions(-) diff --git a/ckan/model/license.py b/ckan/model/license.py index f717113ba92..d6490927435 100644 --- a/ckan/model/license.py +++ b/ckan/model/license.py @@ -1,9 +1,11 @@ -from pylons import config import datetime import urllib2 -from ckan.lib.helpers import json import re +from pylons import config + +import ckan.lib.helpers as h + class License(object): """Domain object for a license.""" @@ -55,7 +57,7 @@ def load_licenses(self, license_url): msg = "Couldn't connect to licenses service %r: %s" % (license_url, inst) raise Exception, msg try: - license_data = json.loads(response_body) + license_data = h.json.loads(response_body) except Exception, inst: msg = "Couldn't read response from licenses service %r: %s" % (response_body, inst) raise Exception, inst @@ -81,7 +83,7 @@ def __getitem__(self, key, default=Exception): def get(self, key, default=None): return self.__getitem__(key, default=default) - + def keys(self): return [license.id for license in self.licenses] @@ -90,7 +92,7 @@ def values(self): def items(self): return [(license.id, license) for license in self.licenses] - + def __iter__(self): return iter(self.keys()) @@ -99,204 +101,204 @@ def __len__(self): default_license_list = [ { - "domain_content": False, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "notspecified", - "is_generic": True, - "is_okd_compliant": False, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "License Not Specified", + "domain_content": False, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "notspecified", + "is_generic": True, + "is_okd_compliant": False, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "License Not Specified", "url": "" - }, + }, { - "domain_content": False, - "domain_data": True, - "domain_software": False, - "family": "", - "id": "odc-pddl", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Open Data Commons Public Domain Dedication and Licence (PDDL)", + "domain_content": False, + "domain_data": True, + "domain_software": False, + "family": "", + "id": "odc-pddl", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Open Data Commons Public Domain Dedication and Licence (PDDL)", "url": "http://www.opendefinition.org/licenses/odc-pddl" - }, + }, { - "domain_content": False, - "domain_data": True, - "domain_software": False, - "family": "", - "id": "odc-odbl", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Open Data Commons Open Database License (ODbL)", + "domain_content": False, + "domain_data": True, + "domain_software": False, + "family": "", + "id": "odc-odbl", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Open Data Commons Open Database License (ODbL)", "url": "http://www.opendefinition.org/licenses/odc-odbl" - }, + }, { - "domain_content": False, - "domain_data": True, - "domain_software": False, - "family": "", - "id": "odc-by", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Open Data Commons Attribution License", + "domain_content": False, + "domain_data": True, + "domain_software": False, + "family": "", + "id": "odc-by", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Open Data Commons Attribution License", "url": "http://www.opendefinition.org/licenses/odc-by" - }, + }, { - "domain_content": True, - "domain_data": True, - "domain_software": False, - "family": "", - "id": "cc-zero", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Creative Commons CCZero", + "domain_content": True, + "domain_data": True, + "domain_software": False, + "family": "", + "id": "cc-zero", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Creative Commons CCZero", "url": "http://www.opendefinition.org/licenses/cc-zero" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "cc-by", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Creative Commons Attribution", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "cc-by", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Creative Commons Attribution", "url": "http://www.opendefinition.org/licenses/cc-by" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "cc-by-sa", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Creative Commons Attribution Share-Alike", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "cc-by-sa", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Creative Commons Attribution Share-Alike", "url": "http://www.opendefinition.org/licenses/cc-by-sa" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "gfdl", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "GNU Free Documentation License", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "gfdl", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "GNU Free Documentation License", "url": "http://www.opendefinition.org/licenses/gfdl" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "other-open", - "is_generic": True, - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Other (Open)", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "other-open", + "is_generic": True, + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Other (Open)", "url": "" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "other-pd", - "is_generic": True, - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Other (Public Domain)", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "other-pd", + "is_generic": True, + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Other (Public Domain)", "url": "" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "other-at", - "is_generic": True, - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Other (Attribution)", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "other-at", + "is_generic": True, + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Other (Attribution)", "url": "" - }, + }, { - "domain_content": True, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "uk-ogl", - "is_okd_compliant": True, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "UK Open Government Licence (OGL)", + "domain_content": True, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "uk-ogl", + "is_okd_compliant": True, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "UK Open Government Licence (OGL)", "url": "http://reference.data.gov.uk/id/open-government-licence" - }, + }, { - "domain_content": False, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "cc-nc", - "is_okd_compliant": False, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Creative Commons Non-Commercial (Any)", + "domain_content": False, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "cc-nc", + "is_okd_compliant": False, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Creative Commons Non-Commercial (Any)", "url": "http://creativecommons.org/licenses/by-nc/2.0/" - }, + }, { - "domain_content": False, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "other-nc", - "is_generic": True, - "is_okd_compliant": False, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Other (Non-Commercial)", + "domain_content": False, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "other-nc", + "is_generic": True, + "is_okd_compliant": False, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Other (Non-Commercial)", "url": "" - }, + }, { - "domain_content": False, - "domain_data": False, - "domain_software": False, - "family": "", - "id": "other-closed", - "is_generic": True, - "is_okd_compliant": False, - "is_osi_compliant": False, - "maintainer": "", - "status": "active", - "title": "Other (Not Open)", + "domain_content": False, + "domain_data": False, + "domain_software": False, + "family": "", + "id": "other-closed", + "is_generic": True, + "is_okd_compliant": False, + "is_osi_compliant": False, + "maintainer": "", + "status": "active", + "title": "Other (Not Open)", "url": "" } ]