Changeset 5ce7f17 in sasview for src/sas/dataloader/readers/cansas_reader.py

Timestamp:

Mar 27, 2015 9:05:11 AM (9 years ago)

Author:

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:

cce0ad3

Parents:

a862cea0

Message:

Fix for ticket #395 - Saving a project now saves all fits and loading a
project no longer throws an error by trying to find deprecated fitting
engines.

File:

• src/sas/dataloader/readers/cansas_reader.py (modified) (5 diffs)

src/sas/dataloader/readers/cansas_reader.py

@@ -322 +322 @@
                 value_unit = local_unit
             except:
-                print sys.exc_info()
                 err_msg = "CanSAS reader: unknown error converting "
                 err_msg += "\"{0}\" unit [{1}]"
@@ -990 +989 @@
                 self.append(node, entry_node)
 
-    def _check_origin(self, entry_node, doc):
+    def _check_origin(self, entry_node, doc, frm):
         """
         Return the document, and the SASentry node associated with
@@ -1000 +999 @@
         :param doc: entire xml tree
         """
-        frm = inspect.stack()[1]
+        if not frm:
+            frm = inspect.stack()[1]
         mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
@@ -1011 +1011 @@
             node_list = doc.getElementsByTagName(node_name)
             entry_node = node_list.item(0)
-        return entry_node
+        return doc, entry_node
 
     def _to_xml_doc(self, datainfo):
@@ -1061 +1061 @@
         # If the calling function was not the cansas reader, return a minidom
         #      object rather than an lxml object.
-        entry_node = self._check_origin(entry_node, doc)
+        frm = inspect.stack()[1]
+        doc, entry_node = self._check_origin(entry_node, doc, frm)
         return doc, entry_node