Changeset 7f75a3f in sasview for src/sas/sascalc/dataloader/readers/cansas_reader.py
- Timestamp:
- Apr 5, 2017 9:08:59 AM (7 years ago)
- 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 278ddee
- Parents:
- 69400ec
- git-author:
- Jeff Krzywon <krzywon@…> (04/05/17 09:08:59)
- git-committer:
- krzywon <krzywon@…> (04/05/17 09:08:59)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/readers/cansas_reader.py
r8434365 r7f75a3f 29 29 from sas.sascalc.dataloader.readers.xml_reader import XMLreader 30 30 from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants, CurrentLevel 31 from sas.sascalc.dataloader.loader_exceptions import FileContentsException 31 32 32 33 # The following 2 imports *ARE* used. Do not remove either. … … 534 535 535 536 # Load in xml file and get the cansas version from the header 536 self.set_xml_file(xml_file) 537 from lxml import etree 538 try: 539 self.set_xml_file(xml_file) 540 except etree.XMLSyntaxError: 541 msg = "Cansas cannot load this file" 542 raise FileContentsException, msg 537 543 self.cansas_version = self.xmlroot.get("version", "1.0") 538 544
Note: See TracChangeset
for help on using the changeset viewer.