entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 41 Releases Activity

misc: use global evaluation dictionary when evaluating data sources (#16978) 

This makes it possible to use "evalutils" functions and "complex" types.
This commit is contained in:
Frédéric Péters 2017-07-29 14:39:33 +02:00
parent ba4b56e7b2
commit e3ab691c89
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_datasource.py
View File

@ -104,6 +104,14 @@ def test_python_datasource():
('foo', 'Foo', 'foo', {'id': 'foo', 'text': 'Foo'}),
('bar', 'Bar', 'bar', {'id': 'bar', 'text': 'Bar', 'disabled': True})]
def test_python_datasource_with_evalutils():
plain_list = [
{'id': 'foo', 'text': 'Foo', 'value': '2017-01-01'},
{'id': 'bar', 'text': 'Bar', 'value': '2015-01-01'}]
datasource = {'type': 'formula', 'value': '[x for x in %s if date(x["value"]) > date("2016-01-01")]' % repr(plain_list)}
assert data_sources.get_items(datasource) == [
('foo', 'Foo', 'foo', {'id': 'foo', 'text': 'Foo', 'value': '2017-01-01'})]
def test_json_datasource():
datasource = {'type': 'json', 'value': ''}
assert data_sources.get_items(datasource) == []

6
wcs/data_sources.py
View File

@ -116,9 +116,11 @@ def get_structured_items(data_source):
# - three elements, (id, text, key)
# - two elements, (id, text)
# - a single element, (id,)
vars = get_publisher().substitutions.get_context_variables()
variables = get_publisher().substitutions.get_context_variables()
global_eval_dict = get_publisher().get_global_eval_dict()
global_eval_dict.update(data_source_functions)
try:
value = eval(data_source.get('value'), vars, data_source_functions)
value = eval(data_source.get('value'), global_eval_dict, variables)
if not isinstance(value, collections.Iterable):
get_logger().warn('Python data source (%r) gave a non-iterable result' % \
data_source.get('value'))