Rename module= to env=

calculate/lib/cl_template.py

@@ -475,7 +475,7 @@ class fileHeader(_terms):
     # Допустимые параметры заголовка
     allowParam = ["format", "format_conf", "comment", "append", "force",
                   "link", "mirror", "symbolic", "chmod", "chown", "name",
-                  "path", "autoupdate", "exec","merge", "module"]
+                  "path", "autoupdate", "exec","merge", "module","env"]
 
     # Тип шаблона
     fileType = ""
@@ -591,7 +591,7 @@ class fileHeader(_terms):
                                                 incorrectParams = set([i])
                                     elif len(par) == 2:
                                         self.params[par[0]] = par[1]
-                                        if par[0] == "module":
+                                        if par[0] == "env":
                                             try:
                                                 varModule = \
                                                     importlib.import_module(
@@ -661,7 +661,7 @@ class dirHeader(_terms):
     """
     # Допустимые параметры заголовка
     allowParam = ["append", "chmod", "chown", "name", "path", "autoupdate",
-                  "module"]
+                  "module","env"]
 
     # Тип вставки шаблона
     typeAppend = ""
@@ -744,7 +744,7 @@ class dirHeader(_terms):
                                             incorrectParams = set([i])
                                 elif len(par) == 2:
                                     self.params[par[0]] = par[1]
-                                    if par[0] == "module":
+                                    if par[0] == "env":
                                         try:
                                             varModule = \
                                                 importlib.import_module(
@@ -752,7 +752,7 @@ class dirHeader(_terms):
                                         except (ImportError,AttributeError),e:
                                             self.headerTerm = False
                                         self.objVar.defaultModule = \
-                                            self.params['module']
+                                            self.params['env']
                     typeAppend = self._getAppend()
                     if typeAppend:
                         self.typeAppend = typeAppend
@@ -4214,7 +4214,7 @@ re.M|re.S)
 
         headerLine = self.getHeaderText(textTemplate)
         if headerLine:
-            moduleParam = filter(lambda x:x.startswith('module='),
+            moduleParam = filter(lambda x:x.startswith('env='),
                           headerLine.split())
             if moduleParam:
                 self.objVar.defaultModule = moduleParam[0].partition('=')[2]
@@ -4895,7 +4895,7 @@ re.M|re.S)
         templateFileType = self.getTemplateType()
         headerLine = self.getHeaderText(self.textTemplate)
         if headerLine:
-            moduleParam = filter(lambda x:x.startswith('module='),
+            moduleParam = filter(lambda x:x.startswith('env='),
                           headerLine.split())
             if moduleParam:
                 self.objVar.defaultModule = moduleParam[0].partition('=')[2]