Changeset bb1b892 in sasview for src/sans/dataloader

Timestamp:

May 15, 2014 12:10:44 PM (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:

51af54b, 66f21cd

Parents:

b42f56e

Message:

Try once more to fix the failing Ubuntu tests

File:

• src/sans/dataloader/readers/cansas_reader.py (modified) (1 diff)

src/sans/dataloader/readers/cansas_reader.py

@@ -859 +859 @@
         #      the data we just wrote
         # If the calling function was not the cansas reader, return a minidom
-        #      object rather than an lxml object.
+        #      object rather than an lxml object.        
+        
         frm = inspect.stack()[1]
-        mod_name = frm[1].replace("\\", ".").replace(".pyc", "")
+        mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
-        mod = mod_name.split(".")
-        last_value = len(mod) - 1
-        mod_name = mod[last_value]
+        mod = mod_name.split("/readers/")
+        mod_name = mod[1]
         if mod_name != "cansas_reader":
             string = self.to_string(doc, pp=False)