Changeset f00072f in sasview for test/sasdataloader/test/utest_cansas.py

Timestamp:

Sep 23, 2017 12:30:40 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:

1cdbcd8

Parents:

c8321cfc

Message:

update cansas reader tests for python 3

File:

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

test/sasdataloader/test/utest_cansas.py

@@ -17 +17 @@
 
 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
@@ -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("?>", "")