Changeset 4333edf in sasview

Timestamp:

Jan 22, 2019 7:17:52 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

fcd5d57

Parents:

1d6899f

Message:

Deal with pesky warnings about functions not being properly serialized.
They are now, although they are pretty redundant for Data1D/Data2D
structures.

File:

• src/sas/qtgui/Utilities/GuiUtils.py (modified) (4 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -12 +12 @@
 import urllib.parse
 import json
+import types
 from io import BytesIO
 
@@ -1222 +1223 @@
             return add_type(content, type(o))
 
+        if isinstance(o, types.FunctionType):
+            # we have a pure function
+            content = o.__dict__.copy()
+            return add_type(content, type(o))
+
         # not supported
         logging.info("data cannot be serialized to json: %s" % type(o))
@@ -1234 +1240 @@
     '''
     supported = [
-        tuple, set,
+        tuple, set, types.FunctionType,
         Sample, Source, Vector,
         Plottable, Data1D, Data2D, PlottableTheory1D, PlottableFit1D, Text, Chisq, View,
@@ -1289 +1295 @@
             buffer.seek(0)
             return np.load(buffer)
+
+        # function
+        if cls == types.FunctionType:
+            return cls
 
         logging.info('not implemented: %s, %s' % (type, cls))