Kaydet (Commit) b649d9f8 authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Fixed minidom errors

üst 88b08dab
......@@ -447,7 +447,7 @@ class SpecFile(xmlfile.XmlFile, metaclass=autoxml.autoxml):
#FIXME: How can we fix it
for pak in doc.childNodes:
if pak.nodeType == pak.ELEMENT_NODE and pak.tagName == "Package"
if pak.nodeType == pak.ELEMENT_NODE and pak.tagName == "Package":
for inst in self.packages:
if inst.name == pak.getElementsByTagName("Name")[0].firstChild.data:
self._set_i18n(pak, inst)
......
......@@ -243,7 +243,7 @@ class InstallDB(lazydb.LazyDB):
dependency.package = node.childNodes[0]
#FIXME: Bir sakatlık çıkacak
if node.attributes():
attr = node.attributes)()[0]
attr = node.attributes()()[0]
dependency.__dict__[str(attr)] = node.getAttribute(str(attr))
return dependency
......
......@@ -55,7 +55,7 @@ class PackageDB(lazydb.LazyDB):
def __generate_replaces(self, doc):
for x in doc.getElementsByTagName("Package"):
if x.getElementsByTagName("Replaces")[0]]:
if x.getElementsByTagName("Replaces")[0]:
return x.getElementsByTagName("Name")[0].firstChild.data
def __generate_obsoletes(self, doc):
......@@ -77,7 +77,7 @@ class PackageDB(lazydb.LazyDB):
def __generate_revdeps(self, doc):
revdeps = {}
for node in doc.childNodes:
if node.nodeType == node.ELEMENT_NODE and node.tagName == "Package"
if node.nodeType == node.ELEMENT_NODE and node.tagName == "Package":
name = node.getElementsByTagName('Name')[0].firstChild.data
deps = node.getElementsByTagName('RuntimeDependencies')
if deps:
......
......@@ -41,9 +41,9 @@ def parse(fileName):
try:
dom = minidom.parse(fileName)
return dom.documentElement
except ExpatError, inst:
raise Error(_("File '%s' has invalid XML: %s\n") % (fileName,
str(inst)))
except ExpatError as err:
raise Error(_("File '{}' has invalid XML: {}\n").format(fileName,
str(err)))
def getAllNodes(node, tagPath):
"""retrieve all nodes that match a given tag path."""
......@@ -73,7 +73,7 @@ def setNodeAttribute(node, attrname, value):
def getChildElts(parent):
"""get only child elements"""
return [x if x.nodeType == x.ELEMENT_NODE: for x in parent.childNodes]
return [x for x in parent.childNodes if x.nodeType == x.ELEMENT_NODE]
def getTagByName(parent, childName):
return [x for x in parent.childNodes
......
......@@ -45,7 +45,7 @@ class XmlFile(object):
def newDocument(self):
"""clear DOM"""
impl = minidom.getDOMImplementation()
self.doc = impl.createDocument(None, self.rootTag, None).documentElement
self.doc = impl.createDocument(None, self.rootTag, None)
def unlink(self):
"""deallocate DOM structure"""
......@@ -58,7 +58,7 @@ class XmlFile(object):
def parsexml(self, file):
try:
self.doc = minidom.parseString(str(file))
self.doc = minidom.parseString(file)
return self.doc.documentElement
except Exception as e:
raise Error(_("File '{}' has invalid XML").format(file) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment