entrouvert
/
wcs-olap
16
0
Fork 0
Code Issues Pull Requests Releases Activity

Python3

This commit is contained in:
Benjamin Dauvergne 2019-01-18 08:50:00 +01:00
parent ccc0110b1a
commit 99370bdc98
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -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'],
},

3
wcs_olap/feeder.py
View File

@ -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())