Changeset 7b50f14 in sasview for src/sas/sascalc/dataloader/readers/xml_reader.py

Timestamp:

Sep 22, 2017 5:40:41 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:

d04ac05

Parents:

46cf4c9

Message:

restore python 2 functionality

File:

• src/sas/sascalc/dataloader/readers/xml_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/xml_reader.py

@@ -20 +20 @@
 from lxml.builder import E
 
-from sas.sascalc.dataloader.file_reader_base_class import FileReader
+from ..file_reader_base_class import FileReader, decode
 
 logger = logging.getLogger(__name__)
@@ -153 +153 @@
         Converts an etree element into a string
         """
-        return etree.tostring(elem, pretty_print=pretty_print,
-                              encoding=encoding).decode()
+        return decode(etree.tostring(elem, pretty_print=pretty_print,
+                                     encoding=encoding))
 
     def break_processing_instructions(self, string, dic):