xml_marshaller: fix dump of bytes with Python 2 and update tests

README.txt

@@ -29,10 +29,10 @@ For simple serialisation and unserialisation::
 
 
   >>> from xml_marshaller import xml_marshaller
-  >>> xml_marshaller.dumps(['item1', {'key1': 1, 'key2': u'unicode string'}])
-  '<marshal><list id="i2"><string>item1</string><dictionary id="i3"><string>key1</string><int>1</int><string>key2</string><unicode>unicode string</unicode></dictionary></list></marshal>'
-  >>> xml_marshaller.loads(xml_marshaller.dumps(['item1', {'key1': 1, 'key2': u'unicode string'}]))
-  ['item1', {'key2': u'unicode string', 'key1': 1}]
+  >>> xml_marshaller.dumps(['item1', {'key1': 1, 'key2': 'string'}])
+  '<marshal><list id="i2"><string>item1</string><dictionary id="i3"><string>key1</string><int>1</int><string>key2</string><string>string</string></dictionary></list></marshal>'
+  >>> xml_marshaller.loads(xml_marshaller.dumps(['item1', {'key1': 1, 'key2': 'string'}]))
+  ['item1', {'key2': 'string', 'key1': 1}]
 
 Can works with file like objects::
 

src/xml_marshaller/tests/test_xml_marshaller.py

@@ -60,7 +60,7 @@ class TestXMLMarhsaller(unittest.TestCase):
                  ['alpha', 'beta', 'gamma', [None, 1, 1<<123, 19.72,
                                              1+5j, "& a <fake tag>"]],
                  {'key': 'value', 1: 2},
-                 u'éàù^ç',
+                 'éàù^ç',
                  {'a', 1},
                  True,
                  False,
@@ -83,7 +83,7 @@ class TestXMLMarhsaller(unittest.TestCase):
                  ['alpha', 'beta', 'gamma', [None, 1, 1<<123, 19.72,
                                                 1+5j, "& a <fake tag>"]],
                  {'key': 'value', 1: 2},
-                 u'éàù^ç',
+                 'éàù^ç',
                  {'a', 1},
                  True,
                  False,

src/xml_marshaller/xml_marshaller.py

@@ -161,7 +161,9 @@ class Marshaller(object):
   def m_bytes(self, value, kw):
     return self.m_string(value.decode('utf-8'), kw)
 
-  m_unicode = m_str
+  if str is bytes:
+    m_unicode = m_str
+    m_str = m_bytes
 
   def m_int(self, value, kw):
     return (self.tag_int if -1e24 < value < 1e24 else