From 1647e69b6ad5b03fff13b0b2cdef726d8eabe593 Mon Sep 17 00:00:00 2001 From: merav-aharoni Date: Sun, 1 Oct 2023 08:52:21 +0000 Subject: [PATCH 1/2] Changed inheritance of exception classes --- qiskit_ibm_provider/qpy/exceptions.py | 5 +++-- qiskit_ibm_provider/visualization/exceptions.py | 9 +-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qiskit_ibm_provider/qpy/exceptions.py b/qiskit_ibm_provider/qpy/exceptions.py index 9b23810db..a537ed9a1 100644 --- a/qiskit_ibm_provider/qpy/exceptions.py +++ b/qiskit_ibm_provider/qpy/exceptions.py @@ -12,10 +12,11 @@ """Exception for errors raised by the pulse module.""" from typing import Any -from qiskit.exceptions import QiskitError +from qiskit.qpy.exceptions import QpyError +from ..exceptions import IBMError -class QpyError(QiskitError): +class IBMQpyError(QpyError, IBMError): """Errors raised by the qpy module.""" def __init__(self, *message: Any): diff --git a/qiskit_ibm_provider/visualization/exceptions.py b/qiskit_ibm_provider/visualization/exceptions.py index ed1cf8910..91504abb7 100644 --- a/qiskit_ibm_provider/visualization/exceptions.py +++ b/qiskit_ibm_provider/visualization/exceptions.py @@ -12,14 +12,7 @@ """Exceptions related to the visualization modules.""" -from ..exceptions import IBMError - - -class VisualizationError(IBMError): - """Base class for errors raised by the visualization modules.""" - - pass - +from qiskit.visualization.exceptions import VisualizationError class VisualizationValueError(VisualizationError, ValueError): """Value errors raised by the visualization modules.""" From 492dfca230f997478d6e96968d9ccdb8bf192b7a Mon Sep 17 00:00:00 2001 From: merav-aharoni Date: Sun, 1 Oct 2023 09:40:51 +0000 Subject: [PATCH 2/2] Changed error type --- qiskit_ibm_provider/visualization/exceptions.py | 1 + test/unit/mock/fake_account_client.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qiskit_ibm_provider/visualization/exceptions.py b/qiskit_ibm_provider/visualization/exceptions.py index 91504abb7..627d68f6a 100644 --- a/qiskit_ibm_provider/visualization/exceptions.py +++ b/qiskit_ibm_provider/visualization/exceptions.py @@ -14,6 +14,7 @@ from qiskit.visualization.exceptions import VisualizationError + class VisualizationValueError(VisualizationError, ValueError): """Value errors raised by the visualization modules.""" diff --git a/test/unit/mock/fake_account_client.py b/test/unit/mock/fake_account_client.py index a21a726d3..8d447e327 100644 --- a/test/unit/mock/fake_account_client.py +++ b/test/unit/mock/fake_account_client.py @@ -16,6 +16,7 @@ from typing import List, Dict, Any, Optional from qiskit.providers.fake_provider.backends.lima.fake_lima import FakeLima +from qiskit.providers.exceptions import QiskitBackendNotFoundError class FakeApiBackend: @@ -81,7 +82,7 @@ def backend_status(self, backend_name: str) -> Dict[str, Any]: for back in self._backends: if back.name == backend_name: return back.status.copy() - raise ValueError(f"Backend {backend_name} not found") + raise QiskitBackendNotFoundError(f"Backend {backend_name} not found") def backend_properties( self, backend_name: str, datetime: Optional[python_datetime] = None @@ -91,14 +92,14 @@ def backend_properties( for back in self._backends: if back.name == backend_name: return back.properties.copy() - raise ValueError(f"Backend {backend_name} not found") + raise QiskitBackendNotFoundError(f"Backend {backend_name} not found") def backend_pulse_defaults(self, backend_name: str) -> Dict: """Return the pulse defaults of the backend.""" for back in self._backends: if back.name == backend_name: return back.defaults.copy() - raise ValueError(f"Backend {backend_name} not found") + raise QiskitBackendNotFoundError(f"Backend {backend_name} not found") # Test-only methods.