Merge pull request #40 from gisce/autofix/wrapped2_to3_fix

Fix "Prefer `format()` over string interpolation operator" issue

Author: ecarreras

libcomxml/core/__init__.py

@@ -66,7 +66,7 @@ def set_value(self, value):
 
 
     def __str__(self):
-        return (u"<Field:%s>" % (self.name,)).encode('utf8')
+        return (u"<Field:{0!s}>".format(self.name)).encode('utf8')
 
     def __unicode__(self):
         return unicode(self.__str__(), 'utf8')
@@ -117,7 +117,7 @@ def _parse_value(self, element, value=None):
             elif isinstance(value, list):
                 self._parse_list(element, value)
             else:  # default: cast to unicode
-                element.text = u"%s" % value
+                element.text = u"{0!s}".format(value)
 
         return element
 
@@ -127,7 +127,7 @@ def element(self, parent=None):
         :param parent: an etree Element to be used as parent for this one
         """
         if self.namespace:
-            name = '{%s}%s' % (self.namespace, self.name)
+            name = '{{{0!s}}}{1!s}'.format(self.namespace, self.name)
         else:
             name = self.name
         if parent is not None:
@@ -202,7 +202,7 @@ def feed(self, vals):
 
 
     def __str__(self):
-        return (u"<Model:%s>" % (self.name,)).encode('utf8')
+        return (u"<Model:{0!s}>".format(self.name)).encode('utf8')
 
     def __unicode__(self):
         return unicode(self.__str__(), 'utf8')

tests/test_libcomxml.py

@@ -76,7 +76,7 @@ def test_value_rep(self):
                                                      grouping=True)
         self.assertEqual(formated, self.field.element().text)
         self.assertEqual(str(self.field),
-                         '<Quantity uom="unit">%s</Quantity>' % formated)
+                         '<Quantity uom="unit">{0!s}</Quantity>'.format(formated))
 
     def test_update_attributes(self):
         self.field.attributes.update({'uom': 'kg'})