Merge pull request #10285 from bcoca/math_filter_rearrange

rearranged math filters

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
@@ -35,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
@@ -182,51 +182,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 +341,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,
 

lib/ansible/runner/filter_plugins/mathstuff.py

@@ -15,10 +15,56 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+import math
+import collections
+from ansible import errors
 from __future__ import absolute_import
 
-import math
+def unique(a):
-from ansible import errors
+    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:
@@ -61,9 +107,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,
+
         }

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