Use a separate dict for identify the module tags

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2394 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 92d85fdfd0f433947c4b4912e8d75d7869ceed53..3e8f36ba6ec4850085e974560eff052e86db835f 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -240,20 +240,20 @@ def loadModuleDefinition(first_comment):
             moduleDefinition["module_description"] = line[line.find("\\brief") + len("\\brief "):]
     moduleDict = {}
     if "module_name" in moduleDefinition.keys():
-        moduleDict[moduleDefinition["module_name"]] = {}
+        moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]] = {}
         if "module_depends" in moduleDefinition.keys():
-            if type(moduleDefinition["module_depends"]) == str:
-                moduleDefinition["module_depends"] = (moduleDefinition["module_depends"],)
-            moduleDict[moduleDefinition["module_name"]]["depends"] = moduleDefinition["module_depends"]
+            if type(moduleDefinition[const.MODULE_DEFINITION["module_depends"]]) == str:
+                moduleDefinition[const.MODULE_DEFINITION["module_depends"]] = (moduleDefinition[const.MODULE_DEFINITION["module_depends"]],)
+            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["depends"] = moduleDefinition[const.MODULE_DEFINITION["module_depends"]]
         else:
-            moduleDict[moduleDefinition["module_name"]]["depends"] = ()
+            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["depends"] = ()
         if "module_configuration" in moduleDefinition.keys():
-            moduleDict[moduleDefinition["module_name"]]["configuration"] = moduleDefinition["module_configuration"]
+            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["configuration"] = moduleDefinition[const.MODULE_DEFINITION["module_configuration"]]
         else:
-            moduleDict[moduleDefinition["module_name"]]["configuration"] = ""
+            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["configuration"] = ""
         if "module_description" in moduleDefinition.keys():
-            moduleDict[moduleDefinition["module_name"]]["description"] = moduleDefinition["module_description"]
-        moduleDict[moduleDefinition["module_name"]]["enabled"] = False
+            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["description"] = moduleDefinition["module_description"]
+        moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["enabled"] = False
     return toBeParsed, moduleDict
 
 def loadDefineLists(commentList):

diff --git a/wizard/const.py b/wizard/const.py
index 79d72ef83c4ad96b1708edd3996fd1f9215c44be..2b89412634570d8156f9761ddc64637b95d5779c 100644 (file)
--- a/wizard/const.py
+++ b/wizard/const.py
@@ -47,4 +47,10 @@ EXTENSION_FILTER = (
     ".c++",
     ".mk",
     "Makefile",
-)
\ No newline at end of file
+)
+
+MODULE_DEFINITION = {
+    "module_name": "module_name",
+    "module_configuration": "module_configuration",
+    "module_depends": "module_depends",
+}
\ No newline at end of file