Changeset 17a25d4 in sasview


Ignore:
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:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • src/sans/dataloader/readers/xml_reader.py

    reda8972 r17a25d4  
    1717 
    1818class XMLreader(): 
    19      
    2019     
    2120    def __init__(self, xml = None, schema = None, root = None): 
     
    3938            self.xmldoc = etree.parse(self.xml, parser = parser) 
    4039        else: 
    41             raise ValidationError(self, self.findInvalidXML()) 
     40            raise etree.ValidationError(self, self.findInvalidXML()) 
    4241        return self.xmldoc 
    4342     
     
    4746            self.xmldoc = etree.parse(self.xml, parser = parser) 
    4847            self.xmlroot = self.xmldoc.getroot() 
    49         except Exception as e: 
     48        except Exception: 
    5049            ##!TODO: raise exception if no xml is passed to this function 
    5150            print "No xml file was found!" 
     
    5554            self.schema = schema 
    5655            self.schemadoc = etree.parse(self.schema, parser = parser) 
    57         except Exception as e: 
     56        except Exception: 
    5857            ##!TODO: raise exception if no schema is passed to this function 
    5958            print "No schema file was found!" 
     
    8988        self.setXMLFile(self.xml) 
    9089        self.setSchema(self.schema) 
     90         
Note: See TracChangeset for help on using the changeset viewer.