Changes in test/sasdataloader/test/utest_cansas.py [17e257b5:f00072f] in sasview

File:

• test/sasdataloader/test/utest_cansas.py (modified) (7 diffs)

test/sasdataloader/test/utest_cansas.py

@@ -2 +2 @@
     Unit tests for the new recursive cansas reader
 """
+import os
+import sys
+import unittest
+import logging
+import warnings
+if sys.version_info[0] >= 3:
+    from io import StringIO
+else:
+    from StringIO import StringIO
+
+from lxml import etree
+from lxml.etree import XMLSyntaxError
+from xml.dom import minidom
+
 import sas.sascalc.dataloader.readers.cansas_reader as cansas
+from sas.sascalc.dataloader.file_reader_base_class import decode
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.data_info import Data1D, Data2D
@@ -8 +23 @@
 from sas.sascalc.dataloader.readers.cansas_reader import Reader
 from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants
-
-import os
-import sys
-import urllib2
-import StringIO
-import pylint as pylint
-import unittest
-import numpy as np
-import logging
-import warnings
-
-from lxml import etree
-from lxml.etree import XMLSyntaxError
-from xml.dom import minidom
 
 logger = logging.getLogger(__name__)
@@ -62 +63 @@
         Should fail gracefully and send a message to logger.info()
         """
-        invalid = StringIO.StringIO('<a><c></b></a>')
+        invalid = StringIO('<a><c></b></a>')
         self.assertRaises(XMLSyntaxError, lambda: XMLreader(invalid))
 
@@ -74 +75 @@
         string += "\t</xsd:complexType>\n"
         string += "</xsd:schema>"
-        f = StringIO.StringIO(string)
+        f = StringIO(string)
         xmlschema_doc = etree.parse(f)
         xmlschema = etree.XMLSchema(xmlschema_doc)
-        valid = etree.parse(StringIO.StringIO('<a><b></b></a>'))
-        invalid = etree.parse(StringIO.StringIO('<a><c></c></a>'))
+        valid = etree.parse(StringIO('<a><b></b></a>'))
+        invalid = etree.parse(StringIO('<a><c></c></a>'))
         self.assertTrue(xmlschema.validate(valid))
         self.assertFalse(xmlschema.validate(invalid))
@@ -214 +215 @@
             # find the processing instructions and make into a dictionary
             dic = self.get_processing_instructions(reader)
-            self.assertTrue(dic == {'xml-stylesheet': \
-                                    'type="text/xsl" href="cansas1d.xsl" '})
+            self.assertEqual(dic, {'xml-stylesheet':
+                                   'type="text/xsl" href="cansas1d.xsl" '})
 
             xml = "<test><a><b><c></c></b></a></test>"
@@ -238 +239 @@
             attr = {}
             pi_name = ""
-            pi_string = etree.tostring(pi)
+            pi_string = decode(etree.tostring(pi))
             if isinstance(pi_string, str):
                 pi_string = pi_string.replace("<?", "").replace("?>", "")
@@ -309 +310 @@
 
 if __name__ == '__main__':
-    unittest.main()    
+    unittest.main()