diff --git a/qiskit/dagcircuit/dagcircuit.py b/qiskit/dagcircuit/dagcircuit.py index 6ecc1f08e696..126f19f1bb5d 100644 --- a/qiskit/dagcircuit/dagcircuit.py +++ b/qiskit/dagcircuit/dagcircuit.py @@ -23,7 +23,6 @@ from collections import OrderedDict, defaultdict, deque, namedtuple import copy import math -import warnings from typing import Dict, Generator, Any, List import numpy as np @@ -657,16 +656,8 @@ def apply_operation_back(self, op, qargs=(), cargs=(), *, check=True): DAGCircuitError: if a leaf node is connected to multiple outputs """ - if qargs is None: - _warn_none_args() - qargs = () - else: - qargs = tuple(qargs) - if cargs is None: - _warn_none_args() - cargs = () - else: - cargs = tuple(cargs) + qargs = tuple(qargs) + cargs = tuple(cargs) if self._operation_may_have_bits(op): # This is the slow path; most of the time, this won't happen. @@ -710,16 +701,8 @@ def apply_operation_front(self, op, qargs=(), cargs=(), *, check=True): Raises: DAGCircuitError: if initial nodes connected to multiple out edges """ - if qargs is None: - _warn_none_args() - qargs = () - else: - qargs = tuple(qargs) - if cargs is None: - _warn_none_args() - cargs = () - else: - cargs = tuple(cargs) + qargs = tuple(qargs) + cargs = tuple(cargs) if self._operation_may_have_bits(op): # This is the slow path; most of the time, this won't happen. @@ -2116,12 +2099,3 @@ def draw(self, scale=0.7, filename=None, style="color"): from qiskit.visualization.dag_visualization import dag_drawer return dag_drawer(dag=self, scale=scale, filename=filename, style=style) - - -def _warn_none_args(): - warnings.warn( - "Passing 'None' as the qubits or clbits of an operation to 'DAGCircuit' methods" - " is deprecated since Qiskit 0.45 and will be removed in Qiskit 1.0. Instead, pass '()'.", - DeprecationWarning, - stacklevel=3, - ) diff --git a/releasenotes/notes/remove-dag-none-be220777dc246803.yaml b/releasenotes/notes/remove-dag-none-be220777dc246803.yaml new file mode 100644 index 000000000000..44fbd7d134ee --- /dev/null +++ b/releasenotes/notes/remove-dag-none-be220777dc246803.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + It is no longer allowable to pass ``None`` as the ``qargs`` or ``cargs`` parameters in + :meth:`.DAGCircuit.apply_operation_back` and :meth:`~.DAGCircuit.apply_operation_front`. If you + want to explicitly pass an empty argument, use the empty tuple ``()`` instead. diff --git a/test/python/dagcircuit/test_dagcircuit.py b/test/python/dagcircuit/test_dagcircuit.py index 9d73ac5a1af0..b539ff3d5da3 100644 --- a/test/python/dagcircuit/test_dagcircuit.py +++ b/test/python/dagcircuit/test_dagcircuit.py @@ -487,18 +487,6 @@ def test_apply_operation_back(self): self.assertEqual(len(list(self.dag.nodes())), 16) self.assertEqual(len(list(self.dag.edges())), 17) - def test_apply_operation_rejects_none(self): - """Test that the ``apply_operation_*`` methods warn when given ``None``.""" - noop = Instruction("noop", 0, 0, []) - with self.assertWarnsRegex(DeprecationWarning, "Passing 'None'"): - self.dag.apply_operation_back(noop, None, ()) - with self.assertWarnsRegex(DeprecationWarning, "Passing 'None'"): - self.dag.apply_operation_back(noop, (), None) - with self.assertWarnsRegex(DeprecationWarning, "Passing 'None'"): - self.dag.apply_operation_front(noop, None, ()) - with self.assertWarnsRegex(DeprecationWarning, "Passing 'None'"): - self.dag.apply_operation_front(noop, (), None) - def test_edges(self): """Test that DAGCircuit.edges() behaves as expected with ops.""" x_gate = XGate().c_if(*self.condition)