beremiz: comparison xmlclass/xmlclass.py

equal deleted inserted replaced

-:a80a66ba52d6
+:9f6f46dbe3ae
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import os
 import re
 import datetime
 from functools import reduce
 from xml.dom import minidom
 from xml.sax.saxutils import unescape
 from collections import OrderedDict
-from builtins import str as text
-from six import string_types
-from six.moves import xrange
 from lxml import etree
 def CreateNode(name):
 node = minidom.Node()
 @return: data extracted as string
 """
 if not extract:
 return attr
 if len(attr.childNodes) == 1:
-return text(unescape(attr.childNodes[0].data))
+return str(unescape(attr.childNodes[0].data))
 else:
 # content is a CDATA
 txt = ''
 for node in attr.childNodes:
 if not (node.nodeName == "#text" and node.data.strip() == ''):
-txt += text(unescape(node.data))
+txt += str(unescape(node.data))
-return text
+return txt
 def GetNormalizedString(attr, extract=True):
 """
 Function that normalizes a string according to XML 1.0. Replace
 return {
 "type": COMPLEXTYPE,
 "extract": ExtractAny,
 "generate": GenerateAny,
 "initial": InitialAny,
-"check": lambda x: isinstance(x, (string_types, etree.ElementBase))
+"check": lambda x: isinstance(x, (str, etree.ElementBase))
 }
 def GenerateTagInfos(infos):
 def ExtractTag(tree):
 "check": lambda x: x is None or infos["minOccurs"] == 0 and x
 }
 def FindTypeInfos(factory, infos):
-if isinstance(infos, string_types):
+if isinstance(infos, str):
 namespace, name = DecomposeQualifiedName(infos)
 return factory.GetQualifiedNameInfos(name, namespace)
 return infos
 else:
 lookup_classes[parent] = typeinfos
 def AddToLookupClass(self, name, parent, typeinfos):
 lookup_name = self.etreeNamespaceFormat % name
-if isinstance(typeinfos, string_types):
+if isinstance(typeinfos, str):
 self.AddEquivalentClass(name, typeinfos)
 typeinfos = self.etreeNamespaceFormat % typeinfos
 lookup_classes = self.ComputedClassesLookUp.get(lookup_name)
 if lookup_classes is None:
 self.ComputedClassesLookUp[lookup_name] = (typeinfos, parent)
 self.AddDistinctionBetweenParentsInLookupClass(
 lookup_classes, parent, typeinfos)
 self.ComputedClassesLookUp[lookup_name] = lookup_classes
 def ExtractTypeInfos(self, name, parent, typeinfos):
-if isinstance(typeinfos, string_types):
+if isinstance(typeinfos, str):
 namespace, type_name = DecomposeQualifiedName(typeinfos)
 infos = self.GetQualifiedNameInfos(type_name, namespace)
 if name != "base":
 if infos["type"] == SIMPLETYPE:
 self.AddToLookupClass(name, parent, DefaultElementClass)
 elif namespace == self.TargetNamespace:
 self.AddToLookupClass(name, parent, type_name)
 if infos["type"] == COMPLEXTYPE:
 type_name, parent = self.SplitQualifiedName(type_name, namespace)
 result = self.CreateClass(type_name, parent, infos)
-if result is not None and not isinstance(result, string_types):
+if result is not None and not isinstance(result, str):
 self.Namespaces[self.TargetNamespace][result["name"]] = result
 return result
 elif infos["type"] == ELEMENT and infos["elmt_type"]["type"] == COMPLEXTYPE:
 type_name, parent = self.SplitQualifiedName(type_name, namespace)
 result = self.CreateClass(type_name, parent, infos["elmt_type"])
-if result is not None and not isinstance(result, string_types):
+if result is not None and not isinstance(result, str):
 self.Namespaces[self.TargetNamespace][result["name"]] = result
 return result
 else:
 return infos
 elif typeinfos["type"] == COMPLEXTYPE:
 Method that generates the classes
 """
 self.ParseSchema()
 for name, infos in list(self.Namespaces[self.TargetNamespace].items()):
 if infos["type"] == ELEMENT:
-if not isinstance(infos["elmt_type"], string_types) and \
+if not isinstance(infos["elmt_type"], str) and \
 infos["elmt_type"]["type"] == COMPLEXTYPE:
 self.ComputeAfter.append((name, None, infos["elmt_type"], True))
 while len(self.ComputeAfter) > 0:
 result = self.CreateClass(*self.ComputeAfter.pop(0))
-if result is not None and not isinstance(result, string_types):
+if result is not None and not isinstance(result, str):
 self.Namespaces[self.TargetNamespace][result["name"]] = result
 elif infos["type"] == COMPLEXTYPE:
 self.ComputeAfter.append((name, None, infos))
 while len(self.ComputeAfter) > 0:
 result = self.CreateClass(*self.ComputeAfter.pop(0))
 if result is not None and \
-not isinstance(result, string_types):
+not isinstance(result, str):
 self.Namespaces[self.TargetNamespace][result["name"]] = result
 elif infos["type"] == ELEMENTSGROUP:
 elements = []
 if "elements" in infos:
 elements = infos["elements"]
 elif "choices" in infos:
 elements = infos["choices"]
 for element in elements:
-if not isinstance(element["elmt_type"], string_types) and \
+if not isinstance(element["elmt_type"], str) and \
 element["elmt_type"]["type"] == COMPLEXTYPE:
 self.ComputeAfter.append((element["name"], infos["name"], element["elmt_type"]))
 while len(self.ComputeAfter) > 0:
 result = self.CreateClass(*self.ComputeAfter.pop(0))
 if result is not None and \
-not isinstance(result, string_types):
+not isinstance(result, str):
 self.Namespaces[self.TargetNamespace][result["name"]] = result
 for name, parents in self.ComputedClassesLookUp.items():
 if isinstance(parents, dict):
 computed_classes = list(parents.items())
 self.ElementClass = None
 def GetElementClass(self, element_tag, parent_tag=None, default=DefaultElementClass):
 element_class = self.LookUpClasses.get(element_tag, (default, None))
 if not isinstance(element_class, dict):
-if isinstance(element_class[0], string_types):
+if isinstance(element_class[0], str):
 return self.GetElementClass(element_class[0], default=default)
 return element_class[0]
 element_with_parent_class = element_class.get(parent_tag, default)
-if isinstance(element_with_parent_class, string_types):
+if isinstance(element_with_parent_class, str):
 return self.GetElementClass(element_with_parent_class, default=default)
 return element_with_parent_class
 def SetLookupResult(self, element, element_class):
 """
 if isinstance(element_class, list):
 children = "".join([
 "%s " % etree.QName(child.tag).localname
 for child in element])
 for possible_class in element_class:
-if isinstance(possible_class, string_types):
+if isinstance(possible_class, str):
 possible_class = self.GetElementClass(possible_class)
 if possible_class.StructurePattern.match(children) is not None:
 return possible_class
 return element_class[0]
 return element_class

branch	python3
changeset 3752	9f6f46dbe3ae
parent 3750	f62625418bff
child 3755	ca814b175391