Changeset cb11a25 in sasview

Timestamp:

Nov 4, 2017 7:20:24 AM (6 years ago)

Author:

Stuart Prescott <stuart@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b6b81a3, 0675e6b

Parents:

08b9e331

git-author:

Stuart Prescott <stuart@…> (11/01/17 16:48:52)

git-committer:

Stuart Prescott <stuart@…> (11/04/17 07:20:24)

Message:

Fix instance vs class variables in FileReader?

Class variables get inherited and shared between different instantiations
of the class and this means that the current usage of TestFileReader? in
utest_generic_file_reader_class.py has side-effects that would cause
subsequent tests to fail.

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -27 +27 @@
 
 class FileReader(object):
-    # List of Data1D and Data2D objects to be sent back to data_loader
-    output = []
-    # Current plottable_(1D/2D) object being loaded in
-    current_dataset = None
-    # Current DataInfo object being loaded in
-    current_datainfo = None
     # String to describe the type of data this reader can load
     type_name = "ASCII"
@@ -43 +37 @@
     # Able to import the unit converter
     has_converter = True
-    # Open file handle
-    f_open = None
     # Default value of zero
     _ZERO = 1e-16
+
+    def __init__(self):
+        # List of Data1D and Data2D objects to be sent back to data_loader
+        self.output = []
+        # Current plottable_(1D/2D) object being loaded in
+        self.current_dataset = None
+        # Current DataInfo object being loaded in
+        self.current_datainfo = None
+        # Open file handle
+        self.f_open = None
 
     def read(self, filepath):