xmlunwrap: Fix pytype warning and cover changed function

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>

Author: bernhardkaindl

tests/test_xmlunwrap.py

@@ -2,11 +2,11 @@
 import xml.dom.minidom
 
 from xcp.xmlunwrap import (getElementsByTagName, getText, getMapAttribute,
-                           getStrAttribute, XmlUnwrapError)
+                           getStrAttribute, getIntAttribute, XmlUnwrapError)
 
 class TestXmlUnwrap(unittest.TestCase):
     def setUp(self):
-        a_text = """<installation mode='test'>
+        a_text = """<installation mode='test' integer='1'>
         <fred>text1</fred>
         <fred>text2</fred>
         </installation>"""
@@ -20,17 +20,25 @@ def test(self):
                           for el in getElementsByTagName(self.top_el, ["fred"])],
                          ["text1", "text2"])
 
+        # Test xcp.xmlunwrap.getIntAttribute()
+        self.assertEqual(getIntAttribute(self.top_el, ["integer"], 5), 1)
+        self.assertEqual(getIntAttribute(self.top_el, ["noexist"], 5), 5)
+        with self.assertRaises(XmlUnwrapError):
+            getIntAttribute(self.top_el, ["nonexisting-attribute"])
+
+        # Test xcp.xmlunwrap.getMapAttribute()
         x = getMapAttribute(self.top_el, ["mode"], [('test', 42), ('stuff', 77)])
         self.assertEqual(x, 42)
         x = getMapAttribute(self.top_el, ["made"], [('test', 42), ('stuff', 77)],
                             default='stuff')
         self.assertEqual(x, 77)
 
+        # Test xcp.xmlunwrap.getIntAttribute()
         x = getStrAttribute(self.top_el, ["mode"])
         self.assertEqual(x, "test")
         x = getStrAttribute(self.top_el, ["made"])
         self.assertEqual(x, "")
-        x = getStrAttribute(self.top_el, ["made"], None)
+        x = getStrAttribute(self.top_el, ["made"], None)  # pyright: ignore
         self.assertEqual(x, None)
 
         with self.assertRaises(XmlUnwrapError):

xcp/xmlunwrap.py

@@ -73,10 +73,9 @@ def getIntAttribute(el, attrs, default = None):
     if val == '':
         return default
     try:
-        int_val = int(val, 0)
+        return int(val, 0)
     except Exception as e:
         six.raise_from(XmlUnwrapError("Invalid integer value for %s" % attrs[0]), e)
-    return int_val
 
 def getMapAttribute(el, attrs, mapping, default = None):
     mandatory = (default == None)