minor fixes

pym/calculate/lib/cl_template.py

@@ -14,7 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from __future__ import absolute_import
 import sys
 import os
 import stat

pym/calculate/lib/cl_xml.py

@@ -455,7 +455,7 @@ class xmlDoc(object):
                     elif app == "append":
                         xmlArea.append(newNode)
                 if xmlOldField:
-                    parentNode = xmlOldField.getparent()
+                    parentNode = xmlOldField.getparent() 
                     if parentNode and newFieldsAction != "join":
                         parentNode.remove(xmlOldField)
 

pym/calculate/lib/format/samba.py

@@ -40,9 +40,9 @@ class samba(objShare):
         self._splitToFields = self.splitToFields
         # Объект документ
         self.docObj = self._textToXML()
-        print("DEBUG samba format")
-        from lxml import etree
-        print(str(etree.tostring(self.docObj.doc, pretty_print=True), encoding="UTF-8"))
+        # print("DEBUG samba format")
+        # from lxml import etree
+        # print(str(etree.tostring(self.docObj.doc, pretty_print=True), encoding="UTF-8"))
         # XML документ
         self.doc = self.docObj.doc
 
@@ -110,8 +110,8 @@ class samba(objShare):
     def join(self, sambaObj):
         """Объединяем конфигурации"""
         if isinstance(sambaObj, samba):
-            print("DEBUG samba format join\n")
-            from lxml import etree
+            # print("DEBUG samba format join\n")
+            # from lxml import etree
             # print("before join (a):")
             # print(str(etree.tostring(self.docObj.doc, pretty_print=True), encoding="UTF-8"))
             # print("before join (b):")
@@ -290,8 +290,8 @@ class samba(objShare):
                     # Обработка условий для samba
                     if (f.name[0] == "!" or
                             f.name[0] == "-" or f.name[0] == "+"):
-                        print("DEBUG !")
-                        print(f.name[0])
+                        # print("DEBUG !")
+                        # print(f.name[0])
                         qns = self.removeSymbolTerm(f.br)
                         xmlField = docObj.createField(
                             "var", [qns], f.name[1:], [f.value])

pym/calculate/lib/utils/text.py

@@ -29,7 +29,7 @@ setLocalTranslate('cl_lib3', sys.modules[__name__])
 _u = lambda t: t if isinstance(t, str) else t
 _uu = lambda *tt: tuple(_u(t) for t in tt)
 # _u8 = lambda t: t.encode('UTF-8', 'replace') if isinstance(t, str) else t
-_u8 = lambda t: t  if isinstance(t, str) else t
+_u8 = lambda t: t
 _uu8 = lambda *tt: tuple(_u8(t) for t in tt)