From 1daf816795b2ebb0ff6309ac8d8dff64045f92a8 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 18 Jan 2019 08:50:00 +0100 Subject: [PATCH 2/3] Python3 --- setup.py | 2 +- wcs_olap/feeder.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index efb0750..c9519c0 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ setup(name="wcs-olap", maintainer_email="bdauvergne@entrouvert.com", packages=find_packages(), include_package_data=True, - install_requires=['requests', 'psycopg2', 'isodate'], + install_requires=['requests', 'psycopg2', 'isodate', 'six'], entry_points={ 'console_scripts': ['wcs-olap=wcs_olap.cmd:main'], }, diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index 9d525db..5b1c07c 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import six import copy import os import json @@ -343,7 +344,7 @@ CREATE TABLE public.dates AS (SELECT ctx.update(self.default_ctx) def helper(o): - if isinstance(o, basestring): + if isinstance(o, six.string_types): return o.format(**ctx) elif isinstance(o, dict): return dict((k, helper(v)) for k, v in o.iteritems()) -- 2.20.1