0002-Python3.patch
setup.py | ||
---|---|---|
54 | 54 |
maintainer_email="bdauvergne@entrouvert.com", |
55 | 55 |
packages=find_packages(), |
56 | 56 |
include_package_data=True, |
57 |
install_requires=['requests', 'psycopg2', 'isodate'], |
|
57 |
install_requires=['requests', 'psycopg2', 'isodate', 'six'],
|
|
58 | 58 |
entry_points={ |
59 | 59 |
'console_scripts': ['wcs-olap=wcs_olap.cmd:main'], |
60 | 60 |
}, |
wcs_olap/feeder.py | ||
---|---|---|
1 | 1 |
# -*- coding: utf-8 -*- |
2 | 2 | |
3 |
import six |
|
3 | 4 |
import copy |
4 | 5 |
import os |
5 | 6 |
import json |
... | ... | |
343 | 344 |
ctx.update(self.default_ctx) |
344 | 345 | |
345 | 346 |
def helper(o): |
346 |
if isinstance(o, basestring):
|
|
347 |
if isinstance(o, six.string_types):
|
|
347 | 348 |
return o.format(**ctx) |
348 | 349 |
elif isinstance(o, dict): |
349 | 350 |
return dict((k, helper(v)) for k, v in o.iteritems()) |
350 |
- |