Refactor two methods moved to core

rdmo/core/imports.py

@@ -6,6 +6,18 @@
 log = logging.getLogger(__name__)
 
 
+def utf8_to_bool(instring):
+    r = None
+    s = instring.decode('utf-8')
+    truelist = ['True', 'true']
+    falselist = ['False', 'false']
+    if s in truelist:
+        r = True
+    elif s in falselist:
+        r = False
+    return r
+
+
 def get_value_from_xml_node(xml_node, element, what_to_get=None):
     r = ''
     try:
@@ -59,3 +71,11 @@ def validate_xml(tempfilename, root_tag):
             log.info('Validation failed. Xml\'s root node is "' + root.tag + '" and not "' + root_tag + '".')
             exit_code = 1
     return exit_code, tree
+
+
+# NOTE: not used yet
+def find_rec(node, element, result):
+    for item in node.findall(element):
+        result.append(item)
+        find_rec(item, element, result)
+    return result

rdmo/domain/imports.py

@@ -121,11 +121,3 @@ def import_verbose_name(verbosename_node, entity):
     except Exception as e:
         log.info('An exception occured: ' + str(e))
         pass
-
-
-# NOTE: not used yet
-def find_rec(node, element, result):
-    for item in node.findall(element):
-        result.append(item)
-        find_rec(item, element, result)
-    return result

rdmo/options/imports.py

@@ -1,6 +1,6 @@
 import logging
 
-from rdmo.core.imports import get_value_from_xml_node
+from rdmo.core.imports import utf8_to_bool, get_value_from_xml_node
 from rdmo.core.utils import get_ns_map, get_ns_tag
 
 
@@ -9,18 +9,6 @@
 log = logging.getLogger(__name__)
 
 
-def utf8_to_bool(instring):
-    r = None
-    s = instring.decode('utf-8')
-    truelist = ['True', 'true']
-    falselist = ['False', 'false']
-    if s in truelist:
-        r = True
-    elif s in falselist:
-        r = False
-    return r
-
-
 def import_options(optionsets_node):
     log.info("Importing options")