Changeset d26f025 in sasview for src/sas/sascalc/fit/Loader.py

Timestamp:

Apr 9, 2017 8:48:35 AM (8 years ago)

Author:

ajj

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:

b6b81a3, 7b15990, 24b3821, cbb9551, 8d891d1, ecdd132, 115eb7e, 2e17ee4, 0657b10

Parents:

ea45bfe (diff), 4342fed0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://www.github.com/sasview/sasview

File:

• src/sas/sascalc/fit/Loader.py (modified) (1 diff)

src/sas/sascalc/fit/Loader.py

@@ -34 +34 @@
     def set_values(self):
         """ Store the values loaded from file in local variables"""
-        if not self.filename == None:
+        if self.filename is not None:
             input_f =  open(self.filename, 'r')
             buff = input_f.read()