Merge pull request scipy#21320 from TiborVoelcker/main

BUG: odr: fix pickling

Author: rkern

scipy/odr/_odrpack.py

@@ -286,7 +286,7 @@ def set_meta(self, **kwds):
     def __getattr__(self, attr):
         """ Dispatch attribute access to the metadata dictionary.
         """
-        if attr in self.meta:
+        if attr != "meta" and attr in self.meta:
             return self.meta[attr]
         else:
             raise AttributeError(f"'{attr}' not in metadata")
@@ -408,17 +408,18 @@ def _cov2wt(self, cov):
             return weights
 
     def __getattr__(self, attr):
-        lookup_tbl = {('wd', 'sx'): (self._sd2wt, self.sx),
-                      ('wd', 'covx'): (self._cov2wt, self.covx),
-                      ('we', 'sy'): (self._sd2wt, self.sy),
-                      ('we', 'covy'): (self._cov2wt, self.covy)}
-
+    
         if attr not in ('wd', 'we'):
-            if attr in self.meta:
+            if attr != "meta" and attr in self.meta:
                 return self.meta[attr]
             else:
                 raise AttributeError(f"'{attr}' not in metadata")
         else:
+            lookup_tbl = {('wd', 'sx'): (self._sd2wt, self.sx),
+                      ('wd', 'covx'): (self._cov2wt, self.covx),
+                      ('we', 'sy'): (self._sd2wt, self.sy),
+                      ('we', 'covy'): (self._cov2wt, self.covy)}
+            
             func, arg = lookup_tbl[(attr, self._ga_flags[attr])]
 
             if arg is not None:
@@ -533,7 +534,7 @@ def __getattr__(self, attr):
         """ Dispatch attribute access to the metadata.
         """
 
-        if attr in self.meta:
+        if attr != "meta" and attr in self.meta:
             return self.meta[attr]
         else:
             raise AttributeError(f"'{attr}' not in metadata")

scipy/odr/tests/test_odr.py

@@ -1,3 +1,4 @@
+import pickle
 import tempfile
 import shutil
 import os
@@ -563,3 +564,43 @@ def func(b, x):
             odr_obj.set_job(fit_type=0, del_init=1)
             # Just make sure that it runs without raising an exception.
             odr_obj.run()
+
+    def test_pickling_data(self):
+        x = np.linspace(0.0, 5.0)
+        y = 1.0 * x + 2.0
+        data = Data(x, y)
+
+        obj_pickle = pickle.dumps(data)
+        del data
+        pickle.loads(obj_pickle)
+
+    def test_pickling_real_data(self):
+        x = np.linspace(0.0, 5.0)
+        y = 1.0 * x + 2.0
+        data = RealData(x, y)
+
+        obj_pickle = pickle.dumps(data)
+        del data
+        pickle.loads(obj_pickle)
+
+    def test_pickling_model(self):
+        obj_pickle = pickle.dumps(unilinear)
+        pickle.loads(obj_pickle)
+
+    def test_pickling_odr(self):
+        x = np.linspace(0.0, 5.0)
+        y = 1.0 * x + 2.0
+        odr_obj = ODR(Data(x, y), unilinear)
+
+        obj_pickle = pickle.dumps(odr_obj)
+        del odr_obj
+        pickle.loads(obj_pickle)
+
+    def test_pickling_output(self):
+        x = np.linspace(0.0, 5.0)
+        y = 1.0 * x + 2.0
+        output = ODR(Data(x, y), unilinear).run
+
+        obj_pickle = pickle.dumps(output)
+        del output
+        pickle.loads(obj_pickle)