Compatibility with Py2

MyCapytain/common/utils.py

@@ -120,14 +120,12 @@ def xmlparser(xml, objectify=True):
     doclose = None
     if isinstance(xml, (etree._Element, ObjectifiedElement, etree._ElementTree)):
         return xml
-    elif isinstance(xml, IOBase):
-        pass
     elif isinstance(xml, basestring):
         xml = StringIO(xml)
         doclose = True
-    else:
-
+    elif not isinstance(xml, IOBase):
         raise TypeError("Unsupported type of resource {}".format(type(xml)))
+
     if objectify:
         parsed = etree.parse(xml).getroot()
     else:

tests/resources/commonTests.py

@@ -1,10 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+from six import text_type as str
+
 import warnings
 from unittest import TestCase
 
 import MyCapytain.errors
 from MyCapytain.common.reference import Reference, URN, Citation
 from MyCapytain.common.utils import Mimetypes
 from MyCapytain.resources.texts.locals.tei import Text
+from io import open
 
 
 class CapitainsXmlTextTest(TestCase):

tests/resources/proto/test_text.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+from six import text_type as str
 
 import unittest
 
 from MyCapytain.resources.prototypes.text import *
 import MyCapytain.common.reference
 import MyCapytain.common.metadata
 
+
 class TestProtoResource(unittest.TestCase):
     """ Test for resource, mother class of Text and Passage """
     def test_init(self):