- possibly fixed error with safe_dump on Mac OSx 10.8.5

- update changelog for version 0.9.4

Author: Paul Müller

ChangeLog.txt

@@ -1,3 +1,11 @@
+0.9.4
+- Batch control allows to select individual parameters (#108)
+- Allow to exclude pages from batch fitting (#107)
+- Bugfixes:
+  - Fix `ValueError` in parameter display
+  - Possibly fixed error with `yaml.safe_dump`
+    on Mac OSx 10.8.5
+  - Make sure background is lower than signal (#137)
 0.9.3
 - Fitting: migrate to lmfit
   - This introduces a new dependency for building PyCorrFit.

pycorrfit/openfile.py

@@ -333,7 +333,22 @@ def SaveSessionData(sessionfile, Infodict):
         # Range of fitting parameters
         Parms[idparm][9] = np.array(Parms[idparm][9],dtype="float").tolist()
         Parmlist.append(Parms[idparm])
-    yaml.safe_dump(Parmlist, open(parmsfilename, "wb"))
+    try:
+        # We would like to perform safe_dump, because in the
+        # Windoes x64 version, some integers are exported
+        # like this: `!!python/long '105'` using `yaml.dump`.
+        with open(parmsfilename, "wb") as yamlfd:
+            yaml.safe_dump(Parmlist, yamlfd)
+    except:# yaml.representer.RepresenterError:
+        # This error occured once on Mac OS 10.8.5:
+        # `RepresenterError: cannot represent an object: 0`
+        # In this case, we choose to use the normal dump
+        # and pray.
+        if os.path.exists(parmsfilename):
+            os.remove(parmsfilename)
+        with open(parmsfilename, "wb") as yamlfd:
+            yaml.dump(Parmlist, yamlfd)
+        
     Arc.write(parmsfilename)
     os.remove(os.path.join(tempdir, parmsfilename))
     # Supplementary data (errors of fit)