Partial backport of distributed-system-analysis#3469 (agent side only…

…) to b0.72 Replace `requests.exceptions.JSONDecodeError' by generic `Exception'. See distributed-system-analysis#3469 for some details. The upstream issue is psf/requests#5794 and the PR is psf/requests#5856 but we are running older versions of `requests' in various places.
ndokos · Jul 10, 2023 · 094a6e3 · 094a6e3
1 parent 65326bf
commit 094a6e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/pbench/cli/agent/commands/results/move.py b/lib/pbench/cli/agent/commands/results/move.py
@@ -5,7 +5,6 @@
 from typing import List
 
 import click
-import requests
 
 from pbench.agent.base import BaseCommand
 from pbench.agent.results import CopyResultTb, MakeResultTb
@@ -111,7 +110,7 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
                     if not res.ok:
                         try:
                             msg = res.json()["message"]
-                        except requests.exceptions.JSONDecodeError:
+                        except Exception:
                             msg = res.text if res.text else res.reason
                         raise CopyResultTb.FileUploadError(msg)
                 except Exception as exc:

diff --git a/lib/pbench/cli/agent/commands/results/push.py b/lib/pbench/cli/agent/commands/results/push.py
@@ -3,7 +3,6 @@
 from typing import List
 
 import click
-import requests
 
 from pbench.agent.base import BaseCommand
 from pbench.agent.results import CopyResultTb
@@ -36,7 +35,7 @@ def execute(self) -> int:
 
         try:
             msg = res.json()["message"]
-        except requests.exceptions.JSONDecodeError:
+        except Exception:
             msg = res.text if res.text else res.reason
 
         # dup or other unexpected but non-error status