Merge pull request #2295 from keflavich/issue2294

Possible fix for issue2294: don't pickle hooks

Author: bsipocz

CHANGES.rst

@@ -39,6 +39,9 @@ Infrastructure, Utility and Other Changes and Additions
 - The obsolete file ``astroquery/utils/testing_tools.py`` has been removed.
   [#2287]
 
+- Callback hooks are deleted before caching.  Potentially all cached queries
+  prior to this PR will be rendered invalid.  [#2295]
+
 
 0.4.5 (2021-12-24)
 ==================

astroquery/query.py

@@ -4,6 +4,7 @@
 import abc
 import inspect
 import pickle
+import copy
 import getpass
 import hashlib
 import keyring
@@ -26,6 +27,10 @@
 
 def to_cache(response, cache_file):
     log.debug("Caching data to {0}".format(cache_file))
+    response = copy.deepcopy(response)
+    if hasattr(response, 'request'):
+        for key in tuple(response.request.hooks.keys()):
+            del response.request.hooks[key]
     with open(cache_file, "wb") as f:
         pickle.dump(response, f)
 

astroquery/utils/tests/test_cache_remote.py

@@ -0,0 +1,27 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+import pytest
+import shutil
+import tempfile
+
+from astroquery.mpc import MPC
+
+
+@pytest.mark.remote_data
+class TestRandomThings:
+
+    @pytest.fixture()
+    def temp_dir(self, request):
+        my_temp_dir = tempfile.mkdtemp()
+
+        def fin():
+            shutil.rmtree(my_temp_dir)
+        request.addfinalizer(fin)
+        return my_temp_dir
+
+    def test_quantity_hooks_cache(self, temp_dir):
+        # Regression test for #2294
+        mpc = MPC()
+        mpc.cache_location = temp_dir
+        mpc.get_observations(12893, cache=True)
+        mpc.get_observations(12894, cache=True)