From dea7fc3ac7457a35c901329415e1f93058affaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agusti=CC=81n=20Benassi?= Date: Tue, 1 Aug 2017 16:56:15 -0300 Subject: [PATCH] =?UTF-8?q?Elimina=20la=20verificaci=C3=B3n=20de=20SSL=20e?= =?UTF-8?q?n=20las=20requests=20de=20ckan=5Freader.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HISTORY.md | 5 +++++ pydatajson/__init__.py | 2 +- pydatajson/ckan_reader.py | 26 +++++++++++++++++--------- setup.py | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 48a5a1b..16c0885 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,11 @@ History ======= +0.2.20 (2017-08-01) +------------------- + +* Elimina la verificación de SSL en las requests de ckan_reader. + 0.2.19 (2017-08-01) ------------------- diff --git a/pydatajson/__init__.py b/pydatajson/__init__.py index 8344f3c..efe2be6 100644 --- a/pydatajson/__init__.py +++ b/pydatajson/__init__.py @@ -9,4 +9,4 @@ __author__ = """Datos Argentina""" __email__ = 'datos@modernizacion.gob.ar' -__version__ = '0.2.19' +__version__ = '0.2.20' diff --git a/pydatajson/ckan_reader.py b/pydatajson/ckan_reader.py index 94f221c..2d0b766 100644 --- a/pydatajson/ckan_reader.py +++ b/pydatajson/ckan_reader.py @@ -43,20 +43,28 @@ def read_ckan_catalog(portal_url): catalog = {} try: - status = portal.call_action('status_show') - packages_list = portal.call_action('package_list') - groups_list = portal.call_action('group_list') - - packages = [portal.call_action('package_show', {'name_or_id': pkg}) - for pkg in packages_list] - - groups = [portal.call_action('group_show', {'id': grp}) - for grp in groups_list] + status = portal.call_action( + 'status_show', requests_kwargs={"verify": False}) + packages_list = portal.call_action( + 'package_list', requests_kwargs={"verify": False}) + groups_list = portal.call_action( + 'group_list', requests_kwargs={"verify": False}) + + packages = [portal.call_action( + 'package_show', {'name_or_id': pkg}, + requests_kwargs={"verify": False}) + for pkg in packages_list] + + groups = [portal.call_action( + 'group_show', {'id': grp}, + requests_kwargs={"verify": False}) + for grp in groups_list] catalog = map_status_to_catalog(status) catalog["dataset"] = map_packages_to_datasets( packages, portal_url) catalog["themeTaxonomy"] = map_groups_to_themes(groups) + except: logging.error( 'Error al procesar el portal %s', portal_url, exc_info=True) diff --git a/setup.py b/setup.py index 62460c0..e43ad41 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='pydatajson', - version='0.2.19', + version='0.2.20', description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.", long_description=readme + '\n\n' + history, author="Datos Argentina",