Changeset 56dac0b in sasview

Timestamp:

Sep 22, 2017 5:02:03 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

26183bf

Parents:

dc8d1c2

Message:

py3 doesn't have StringIO package

File:

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

test/sasdataloader/test/utest_cansas.py

@@ -4 +4 @@
 import os
 import sys
-import StringIO
+from io import StringIO
 import unittest
 import logging
@@ -59 +59 @@
         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))
 
@@ -71 +71 @@
         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))
@@ -211 +211 @@
             # 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>"