cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12318 from mgedmin/py3k

Browse source 
Python 3: make ansible.template.safe_eval() work
This commit is contained in:
James Cammarata 2015-09-11 10:44:37 -04:00
commit 4cdd9b2a82
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/template/safe_eval.py
View file

@ -20,6 +20,7 @@ __metaclass__ = type
import ast import ast
import sys import sys
from six import string_types
from six.moves import builtins from six.moves import builtins
from ansible import constants as C from ansible import constants as C
@ -66,13 +67,21 @@ def safe_eval(expr, locals={}, include_exceptions=False):
) )
# AST node types were expanded after 2.6 # AST node types were expanded after 2.6
if not sys.version.startswith('2.6'): if sys.version_info[:2] >= (2, 7):
SAFE_NODES.union( SAFE_NODES.update(
set( set(
(ast.Set,) (ast.Set,)
) )
) )
# And in Python 3.4 too
if sys.version_info[:2] >= (3, 4):
SAFE_NODES.update(
set(
(ast.NameConstant,)
)
)
filter_list = [] filter_list = []
for filter in filter_loader.all(): for filter in filter_loader.all():
filter_list.extend(filter.filters().keys()) filter_list.extend(filter.filters().keys())
@ -96,7 +105,7 @@ def safe_eval(expr, locals={}, include_exceptions=False):
for child_node in ast.iter_child_nodes(node): for child_node in ast.iter_child_nodes(node):
self.generic_visit(child_node, inside_call) self.generic_visit(child_node, inside_call)
if not isinstance(expr, basestring): if not isinstance(expr, string_types):
# already templated to a datastructure, perhaps? # already templated to a datastructure, perhaps?
if include_exceptions: if include_exceptions:
return (expr, None) return (expr, None)

4
test/units/template/test_safe_eval.py
View file

@ -19,6 +19,7 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import sys
from collections import defaultdict from collections import defaultdict
from ansible.compat.tests import unittest from ansible.compat.tests import unittest
@ -45,3 +46,6 @@ class TestSafeEval(unittest.TestCase):
self.assertEqual(safe_eval('[]', locals=locals_vars), []) self.assertEqual(safe_eval('[]', locals=locals_vars), [])
self.assertEqual(safe_eval('{}', locals=locals_vars), {}) self.assertEqual(safe_eval('{}', locals=locals_vars), {})
@unittest.skipUnless(sys.version_info[:2] >= (2, 7), "Python 2.6 has no set literals")
def test_set_literals(self):
self.assertEqual(safe_eval('{0}'), set([0]))