git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@41 c91db197-33c1-4113-bf15-f8a5c547ca64

16 years ago · 2348f6b364
parent 6b3d89a778
commit 2348f6b364
1 changed files with 2 additions and 1 deletions
--- a/pym/cl_profile.py
+++ b/pym/cl_profile.py
@ -1685,7 +1685,7 @@ class profile(_file, _terms):
        self._reTermBloc = re.compile("#\?(?P<rTerm>[a-zA-Z0-9\-_]+)\
 (?P<lTerm>[\>\<\=\!\&\|]+\
 [a-zA-Z0-9\>\<\=\!\|\&\-_\.]+)#\
-\n*(?P<body>.+?)\n*#(?P=rTerm)#(?P<end>\s+)",re.M|re.S)
+\n*(?P<body>.+?)\n*#(?P=rTerm)#(?P<end>\s*)",re.M|re.S)
        # Объект с переменными
        self.objVar = objVar
        # Базовая директория переноса профилей "/mnt/calculate" или "/" и.т.д
@ -1841,6 +1841,7 @@ class profile(_file, _terms):
                    if self.getError():
                        print self.getError()
                        return False
+        self.closeFiles()

    def __getApplyHeadProfile(self ,newFile, oldFile):
        self.nameFileNew = self.absFileName(newFile)