From 8872bba21f9593edeedd4672f9744a0b8f78d7ac Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 18 Feb 2015 20:03:05 -0500 Subject: [PATCH 1/2] rearranged math filters --- lib/ansible/runner/filter_plugins/core.py | 54 ----------------- .../filter_plugins/{math.py => mathstuff.py} | 59 ++++++++++++++++++- test/units/TestFilters.py | 5 +- 3 files changed, 60 insertions(+), 58 deletions(-) rename lib/ansible/runner/filter_plugins/{math.py => mathstuff.py} (56%) diff --git a/lib/ansible/runner/filter_plugins/core.py b/lib/ansible/runner/filter_plugins/core.py index 4680cf6b58..4507d45a5d 100644 --- a/lib/ansible/runner/filter_plugins/core.py +++ b/lib/ansible/runner/filter_plugins/core.py @@ -23,7 +23,6 @@ import types import pipes import glob import re -import collections import crypt import hashlib import string @@ -182,51 +181,6 @@ def ternary(value, true_val, false_val): else: return false_val -def unique(a): - if isinstance(a,collections.Hashable): - c = set(a) - else: - c = [] - for x in a: - if x not in c: - c.append(x) - return c - -def intersect(a, b): - if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): - c = set(a) & set(b) - else: - c = unique(filter(lambda x: x in b, a)) - return c - -def difference(a, b): - if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): - c = set(a) - set(b) - else: - c = unique(filter(lambda x: x not in b, a)) - return c - -def symmetric_difference(a, b): - if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): - c = set(a) ^ set(b) - else: - c = unique(filter(lambda x: x not in intersect(a,b), union(a,b))) - return c - -def union(a, b): - if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): - c = set(a) | set(b) - else: - c = unique(a + b) - return c - -def min(a): - _min = __builtins__.get('min') - return _min(a); - -def max(a): - _max = __builtins__.get('max') - return _max(a); def version_compare(value, version, operator='eq', strict=False): ''' Perform a version comparison on a value ''' @@ -386,14 +340,6 @@ class FilterModule(object): 'ternary': ternary, # list - 'unique' : unique, - 'intersect': intersect, - 'difference': difference, - 'symmetric_difference': symmetric_difference, - 'union': union, - 'min' : min, - 'max' : max, - # version comparison 'version_compare': version_compare, diff --git a/lib/ansible/runner/filter_plugins/math.py b/lib/ansible/runner/filter_plugins/mathstuff.py similarity index 56% rename from lib/ansible/runner/filter_plugins/math.py rename to lib/ansible/runner/filter_plugins/mathstuff.py index 7f6cc19555..88109832a0 100644 --- a/lib/ansible/runner/filter_plugins/math.py +++ b/lib/ansible/runner/filter_plugins/mathstuff.py @@ -15,11 +15,56 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import absolute_import - import math +import collections from ansible import errors +def unique(a): + if isinstance(a,collections.Hashable): + c = set(a) + else: + c = [] + for x in a: + if x not in c: + c.append(x) + return c + +def intersect(a, b): + if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): + c = set(a) & set(b) + else: + c = unique(filter(lambda x: x in b, a)) + return c + +def difference(a, b): + if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): + c = set(a) - set(b) + else: + c = unique(filter(lambda x: x not in b, a)) + return c + +def symmetric_difference(a, b): + if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): + c = set(a) ^ set(b) + else: + c = unique(filter(lambda x: x not in intersect(a,b), union(a,b))) + return c + +def union(a, b): + if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable): + c = set(a) | set(b) + else: + c = unique(a + b) + return c + +def min(a): + _min = __builtins__.get('min') + return _min(a); + +def max(a): + _max = __builtins__.get('max') + return _max(a); + def isnotanumber(x): try: return math.isnan(x) @@ -61,9 +106,19 @@ class FilterModule(object): return { # general math 'isnan': isnotanumber, + 'min' : min, + 'max' : max, # exponents and logarithms 'log': logarithm, 'pow': power, 'root': inversepower, + + # set theory + 'unique' : unique, + 'intersect': intersect, + 'difference': difference, + 'symmetric_difference': symmetric_difference, + 'union': union, + } diff --git a/test/units/TestFilters.py b/test/units/TestFilters.py index d15147b098..3c7eb4506e 100644 --- a/test/units/TestFilters.py +++ b/test/units/TestFilters.py @@ -6,6 +6,7 @@ import os.path import unittest, tempfile, shutil from ansible import playbook, inventory, callbacks import ansible.runner.filter_plugins.core +import ansible.runner.filter_plugins.mathstuff INVENTORY = inventory.Inventory(['localhost']) @@ -182,9 +183,9 @@ class TestFilters(unittest.TestCase): self.assertTrue(ansible.runner.filter_plugins.core.version_compare('12.04', 12, 'ge')) def test_min(self): - a = ansible.runner.filter_plugins.core.min([3, 2, 5, 4]) + a = ansible.runner.filter_plugins.mathstuff.min([3, 2, 5, 4]) assert a == 2 def test_max(self): - a = ansible.runner.filter_plugins.core.max([3, 2, 5, 4]) + a = ansible.runner.filter_plugins.mathstuff.max([3, 2, 5, 4]) assert a == 5 From c92c4e7376b69c351110d3b023a3c6bc2b692b22 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 19 Feb 2015 07:39:45 -0500 Subject: [PATCH 2/2] readded absolute_import --- lib/ansible/runner/filter_plugins/core.py | 1 + lib/ansible/runner/filter_plugins/mathstuff.py | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/ansible/runner/filter_plugins/core.py b/lib/ansible/runner/filter_plugins/core.py index 4507d45a5d..0bcccdceb8 100644 --- a/lib/ansible/runner/filter_plugins/core.py +++ b/lib/ansible/runner/filter_plugins/core.py @@ -34,6 +34,7 @@ import uuid import yaml from jinja2.filters import environmentfilter from distutils.version import LooseVersion, StrictVersion +from __future__ import absolute_import from ansible import errors from ansible.utils.hashing import md5s, checksum_s diff --git a/lib/ansible/runner/filter_plugins/mathstuff.py b/lib/ansible/runner/filter_plugins/mathstuff.py index 88109832a0..c7c108f4e5 100644 --- a/lib/ansible/runner/filter_plugins/mathstuff.py +++ b/lib/ansible/runner/filter_plugins/mathstuff.py @@ -18,6 +18,7 @@ import math import collections from ansible import errors +from __future__ import absolute_import def unique(a): if isinstance(a,collections.Hashable):