Changeset 3241dd2 in sasview for src/sans/dataloader/readers/xml_reader.py

Timestamp:

Sep 25, 2014 10:33:41 AM (10 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a91bc5d

Parents:

72cdbec

Message:

Fixed the issue as described in ticket 269: "Failure to assign model when using attached data file" and made the change for ticket 264: "Remove .TIF extension from Load Data file extension filter."

File:

• src/sans/dataloader/readers/xml_reader.py (modified) (7 diffs)

src/sans/dataloader/readers/xml_reader.py

@@ -15 +15 @@
 #############################################################################
 
+import logging
 from lxml import etree
 from lxml.builder import E
@@ -37 +38 @@
     processing_instructions = None
     
-    def __init__(self, xml = None, schema = None, root = None):
+    def __init__(self, xml = None, schema = None):
         self.xml = xml
         self.schema = schema
         self.processing_instructions = {}
         if xml is not None:
-            self.set_xml_file(xml, root)
+            self.set_xml_file(xml)
         else:
             self.xmldoc = None
@@ -61 +62 @@
         return self.xmldoc
     
-    def set_xml_file(self, xml, root = None):
+    def set_xml_file(self, xml):
         """
         Set the XML file and parse
@@ -69 +70 @@
             self.xmldoc = etree.parse(self.xml, parser = PARSER)
             self.xmlroot = self.xmldoc.getroot()
+        except etree.XMLSyntaxError as xml_error:
+            logging.info(xml_error)
         except Exception:
             self.xml = None
@@ -81 +84 @@
             self.schema = schema
             self.schemadoc = etree.parse(self.schema, parser = PARSER)
+        except etree.XMLSyntaxError as xml_error:
+            logging.info(xml_error)
         except Exception:
             self.schema = None
@@ -105 +110 @@
         try:
             first_error = schema.assertValid(self.xmldoc)
-        except etree.DocumentInvalid as e:
-            first_error = str(e)
+        except etree.DocumentInvalid as err:
+            first_error = str(err)
         return first_error
     
@@ -116 +121 @@
         self.set_schema(self.schema)
         
-    def to_string(self, elem, pp=False, encoding=None):
+    def to_string(self, elem, pretty_print=False, encoding=None):
         """
         Converts an etree element into a string
         """
-        return etree.tostring(elem, pretty_print = pp, encoding = encoding)
+        return etree.tostring(elem, pretty_print = pretty_print, \
+                              encoding = encoding)
     
     def break_processing_instructions(self, string, dic):