Changeset 17a25d4 in sasview

Timestamp:

Dec 30, 2013 1:31:40 PM (11 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:

be577e7

Parents:

19b628f

Message:

I am trying to fix the broken build. I have made a few changes to the file, xml_reader.py, that is causing the issue.

Location:

src/sans/dataloader/readers

Files:

• cansas_reader_new.py (deleted)
• xml_reader.py (modified) (5 diffs)

src/sans/dataloader/readers/xml_reader.py

@@ -17 +17 @@
 
 class XMLreader():
-    
     
     def __init__(self, xml = None, schema = None, root = None):
@@ -39 +38 @@
             self.xmldoc = etree.parse(self.xml, parser = parser)
         else:
-            raise ValidationError(self, self.findInvalidXML())
+            raise etree.ValidationError(self, self.findInvalidXML())
         return self.xmldoc
     
@@ -47 +46 @@
             self.xmldoc = etree.parse(self.xml, parser = parser)
             self.xmlroot = self.xmldoc.getroot()
-        except Exception as e:
+        except Exception:
             ##!TODO: raise exception if no xml is passed to this function
             print "No xml file was found!"
@@ -55 +54 @@
             self.schema = schema
             self.schemadoc = etree.parse(self.schema, parser = parser)
-        except Exception as e:
+        except Exception:
             ##!TODO: raise exception if no schema is passed to this function
             print "No schema file was found!"
@@ -89 +88 @@
         self.setXMLFile(self.xml)
         self.setSchema(self.schema)
+