Updated filters to support version 4 of the layer format.

Documentation has not been updated yet.

Author: clittle

layers/core/filter.py

@@ -6,7 +6,7 @@
         UNSETVALUE
 
 
-class Filter:
+class Filterv4:
     def __init__(self, domain="mitre-enterprise"):
         """
             Initialization - Creates a filter object, with an optional
@@ -15,22 +15,9 @@ def __init__(self, domain="mitre-enterprise"):
             :param domain: The domain used for this layer (mitre-enterprise
                 or mitre-mobile)
         """
-        self.__stages = UNSETVALUE
         self.domain = domain
         self.__platforms = UNSETVALUE
 
-    @property
-    def stages(self):
-        if self.__stages != UNSETVALUE:
-            return self.__stages
-
-    @stages.setter
-    def stages(self, stage):
-        typeCheckerArray(type(self).__name__, stage, str, "stage")
-        categoryChecker(type(self).__name__, stage[0], ["act", "prepare"],
-                        "stages")
-        self.__stages = stage
-
     @property
     def platforms(self):
         if self.__platforms != UNSETVALUE:
@@ -63,3 +50,20 @@ def get_dict(self):
                     = listing[entry]
         if len(temp) > 0:
             return temp
+
+class Filter(Filterv4):
+    def __init__(self, domain="mitre-enterprise"):
+        self.__stages = UNSETVALUE
+        super().__init__(domain)
+
+    @property
+    def stages(self):
+        if self.__stages != UNSETVALUE:
+            return self.__stages
+
+    @stages.setter
+    def stages(self, stage):
+        typeCheckerArray(type(self).__name__, stage, str, "stage")
+        categoryChecker(type(self).__name__, stage[0], ["act", "prepare"],
+                        "stages")
+        self.__stages = stage

layers/core/layerobj.py

@@ -1,5 +1,5 @@
 try:
-    from ..core.filter import Filter
+    from ..core.filter import Filter, Filterv4
     from ..core.layout import Layout
     from ..core.technique import Technique
     from ..core.gradient import Gradient
@@ -51,7 +51,7 @@ def version(self):
     @version.setter
     def version(self, version):
         typeChecker(type(self).__name__, version, str, "version")
-        categoryChecker(type(self).__name__, version, ["3.0"], "version")
+        categoryChecker(type(self).__name__, version, ["3.0", "4.0"], "version")
         self.__version = version
 
     @property
@@ -92,9 +92,13 @@ def filters(self):
 
     @filters.setter
     def filters(self, filters):
-        try:
+        if self.version == "4.0":
+            temp = Filterv4(self.domain)
+        else:
             temp = Filter(self.domain)
-            temp.stages = filters['stages']
+        try:
+            if self.version != "4.0":
+                temp.stages = filters['stages']
             temp.platforms = filters['platforms']
             self.__filters = temp
         except KeyError as e: