Refactor build_cpe.py

ssg/boolean_expression.py

@@ -93,6 +93,14 @@ def arg(self):
     def name(self):
         return self.requirement.project_name
 
+    @staticmethod
+    def cpe_id_is_parametrized(cpe_id):
+        return re.search(r'^\w+\[\w+\]$', cpe_id)
+
+    @staticmethod
+    def is_cpe_name(cpe_id_or_name):
+        return cpe_id_or_name.startswith("cpe:")
+
 
 class Algebra(boolean.BooleanAlgebra):
     """

ssg/build_cpe.py

@@ -6,7 +6,6 @@
 from __future__ import print_function
 import os
 import sys
-import re
 
 from .constants import oval_namespace
 from .constants import PREFIX_TO_NS
@@ -81,22 +80,17 @@ def add_cpe_item(self, cpe_item):
         if cpe_item.is_product_cpe:
             self.product_cpes[cpe_item.id_] = cpe_item
 
-    def _is_name(self, ref):
-        return ref.startswith("cpe:")
-
-    def _is_parametrized(self, ref):
-        return re.search(r'^\w+\[\w+\]$', ref)
-
-    def get_cpe(self, ref):
+    def get_cpe(self, cpe_id_or_name):
         try:
-            if self._is_name(ref):
-                return self.cpes_by_name[ref]
+            if Symbol.is_cpe_name(cpe_id_or_name):
+                return self.cpes_by_name[cpe_id_or_name]
             else:
-                if self._is_parametrized(ref):
-                    ref = get_base_name_of_parametrized_platform(ref)
-                return self.cpes_by_id[ref]
+                if Symbol.cpe_id_is_parametrized(cpe_id_or_name):
+                    cpe_id_or_name = get_base_name_of_parametrized_platform(
+                        cpe_id_or_name)
+                return self.cpes_by_id[cpe_id_or_name]
         except KeyError:
-            raise CPEDoesNotExist("CPE %s is not defined" % (ref))
+            raise CPEDoesNotExist("CPE %s is not defined" % cpe_id_or_name)
 
     def get_cpe_name(self, cpe_id):
         cpe = self.get_cpe(cpe_id)

ssg/utils.py

@@ -333,6 +333,16 @@ def enum(*args):
     return type('Enum', (), enums)
 
 
+def recurse_or_substitute_or_do_nothing(
+        v, string_dict, ignored_keys=frozenset()):
+    if isinstance(v, dict):
+        return apply_formatting_on_dict_values(v, string_dict, ignored_keys)
+    elif isinstance(v, str):
+        return v.format(**string_dict)
+    else:
+        return v
+
+
 def apply_formatting_on_dict_values(source_dict, string_dict, ignored_keys=frozenset()):
     """
     Uses Python built-in string replacement.
@@ -343,12 +353,8 @@ def apply_formatting_on_dict_values(source_dict, string_dict, ignored_keys=froze
     new_dict = {}
     for k, v in source_dict.items():
         if k not in ignored_keys:
-            if isinstance(v, dict):
-                new_dict[k] = apply_formatting_on_dict_values(v, string_dict, ignored_keys)
-            elif isinstance(v, str):
-                new_dict[k] = v.format(**string_dict)
-            else:
-                new_dict[k] = v
+            new_dict[k] = recurse_or_substitute_or_do_nothing(
+                v, string_dict, ignored_keys)
         else:
             new_dict[k] = v
     return new_dict