qiskit 1.1.2__cp38-abi3-macosx_10_9_universal2.whl → 1.2.0__cp38-abi3-macosx_10_9_universal2.whl

qiskit/qasm3/printer.py

@@ -431,26 +431,17 @@ class BasicPrinter:
             self.stream.write("return")
         self._end_statement()
 
-    def _visit_QuantumArgument(self, node: ast.QuantumArgument) -> None:
-        self.stream.write("qubit")
-        if node.designator:
-            self.visit(node.designator)
-        self.stream.write(" ")
-        self.visit(node.identifier)
-
-    def _visit_QuantumGateSignature(self, node: ast.QuantumGateSignature) -> None:
-        self.visit(node.name)
-        if node.params:
-            self._visit_sequence(node.params, start="(", end=")", separator=", ")
-        self.stream.write(" ")
-        self._visit_sequence(node.qargList, separator=", ")
-
     def _visit_QuantumGateDefinition(self, node: ast.QuantumGateDefinition) -> None:
         self._start_line()
         self.stream.write("gate ")
-        self.visit(node.quantumGateSignature)
+        self.visit(node.name)
+        if node.params:
+            self._visit_sequence(node.params, start="(", end=")", separator=", ")
         self.stream.write(" ")
-        self.visit(node.quantumBlock)
+        if node.qubits:
+            self._visit_sequence(node.qubits, separator=", ")
+            self.stream.write(" ")
+        self.visit(node.body)
         self._end_line()
 
     def _visit_CalibrationDefinition(self, node: ast.CalibrationDefinition) -> None:

qiskit/qobj/common.py

@@ -13,6 +13,8 @@
 """Module providing definitions of common Qobj classes."""
 from types import SimpleNamespace
 
+from qiskit.utils import deprecate_func
+
 
 class QobjDictField(SimpleNamespace):
     """A class used to represent a dictionary field in Qobj
@@ -21,6 +23,14 @@ class QobjDictField(SimpleNamespace):
     previously constructed using marshmallow.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, **kwargs):
         """Instantiate a new Qobj dict field object.
 

qiskit/qobj/converters/lo_config.py

@@ -15,6 +15,7 @@
 from qiskit.pulse.channels import DriveChannel, MeasureChannel
 from qiskit.pulse.configuration import LoConfig
 from qiskit.exceptions import QiskitError
+from qiskit.utils import deprecate_func
 
 
 class LoConfigConverter:
@@ -23,6 +24,14 @@ class LoConfigConverter:
     ``get_qubit_los`` and ``get_meas_los`` to align with your backend.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         qobj_model,

qiskit/qobj/converters/pulse_instruction.py

@@ -30,6 +30,7 @@ from qiskit.pulse.parser import parse_string_expr
 from qiskit.pulse.schedule import Schedule
 from qiskit.qobj import QobjMeasurementOption, PulseLibraryItem, PulseQobjInstruction
 from qiskit.qobj.utils import MeasLevel
+from qiskit.utils import deprecate_func
 
 
 class ParametricPulseShapes(Enum):
@@ -89,7 +90,7 @@ class InstructionToQobjConverter:
     The transfer layer format must be the text representation that coforms to
     the `OpenPulse specification<https://arxiv.org/abs/1809.03452>`__.
     Extention to the OpenPulse can be achieved by subclassing this this with
-    extra methods corresponding to each augumented instruction. For example,
+    extra methods corresponding to each augmented instruction. For example,
 
     .. code-block:: python
 
@@ -107,6 +108,14 @@ class InstructionToQobjConverter:
     where ``NewInstruction`` must be a class name of Qiskit Pulse instruction.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         qobj_model: PulseQobjInstruction,
@@ -503,7 +512,7 @@ class QobjToInstructionConverter:
     The transfer layer format must be the text representation that coforms to
     the `OpenPulse specification<https://arxiv.org/abs/1809.03452>`__.
     Extention to the OpenPulse can be achieved by subclassing this this with
-    extra methods corresponding to each augumented instruction. For example,
+    extra methods corresponding to each augmented instruction. For example,
 
     .. code-block:: python
 
@@ -621,7 +630,7 @@ class QobjToInstructionConverter:
             elif prefix == channels.ControlChannel.prefix:
                 return channels.ControlChannel(index)
 
-        raise QiskitError("Channel %s is not valid" % channel)
+        raise QiskitError(f"Channel {channel} is not valid")
 
     @staticmethod
     def disassemble_value(value_expr: Union[float, str]) -> Union[float, ParameterExpression]:
@@ -827,9 +836,7 @@ class QobjToInstructionConverter:
             pulse_name = instruction.label
         except AttributeError:
             sorted_params = sorted(instruction.parameters.items(), key=lambda x: x[0])
-            base_str = "{pulse}_{params}".format(
-                pulse=instruction.pulse_shape, params=str(sorted_params)
-            )
+            base_str = f"{instruction.pulse_shape}_{str(sorted_params)}"
             short_pulse_id = hashlib.md5(base_str.encode("utf-8")).hexdigest()[:4]
             pulse_name = f"{instruction.pulse_shape}_{short_pulse_id}"
         params = dict(instruction.parameters)

qiskit/qobj/pulse_qobj.py

@@ -23,11 +23,20 @@ import numpy
 from qiskit.qobj.common import QobjDictField
 from qiskit.qobj.common import QobjHeader
 from qiskit.qobj.common import QobjExperimentHeader
+from qiskit.utils import deprecate_func
 
 
 class QobjMeasurementOption:
     """An individual measurement option."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, name, params=None):
         """Instantiate a new QobjMeasurementOption object.
 
@@ -89,6 +98,14 @@ class PulseQobjInstruction:
         "parameters",
     ]
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         name,
@@ -209,8 +226,8 @@ class PulseQobjInstruction:
         return out
 
     def __str__(self):
-        out = "Instruction: %s\n" % self.name
-        out += "\t\tt0: %s\n" % self.t0
+        out = f"Instruction: {self.name}\n"
+        out += f"\t\tt0: {self.t0}\n"
         for attr in self._COMMON_ATTRS:
             if hasattr(self, attr):
                 out += f"\t\t{attr}: {getattr(self, attr)}\n"
@@ -282,6 +299,14 @@ def _to_complex(value: Union[List[float], complex]) -> complex:
 class PulseQobjConfig(QobjDictField):
     """A configuration for a Pulse Qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         meas_level,
@@ -383,6 +408,14 @@ class PulseQobjExperiment:
     experiment as part of a larger Pulse Qobj.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, instructions, config=None, header=None):
         """Instantiate a PulseQobjExperiment.
 
@@ -434,10 +467,10 @@ class PulseQobjExperiment:
             header = pprint.pformat(self.header.to_dict() or {})
         else:
             header = "{}"
-        out += "Header:\n%s\n" % header
-        out += "Config:\n%s\n\n" % config
+        out += f"Header:\n{header}\n"
+        out += f"Config:\n{config}\n\n"
         for instruction in self.instructions:
-            out += "\t%s\n" % instruction
+            out += f"\t{instruction}\n"
         return out
 
     @classmethod
@@ -473,6 +506,14 @@ class PulseQobjExperiment:
 class PulseQobjExperimentConfig(QobjDictField):
     """A config for a single Pulse experiment in the qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, qubit_lo_freq=None, meas_lo_freq=None, **kwargs):
         """Instantiate a PulseQobjExperimentConfig object.
 
@@ -492,6 +533,14 @@ class PulseQobjExperimentConfig(QobjDictField):
 class PulseLibraryItem:
     """An item in a pulse library."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, name, samples):
         """Instantiate a pulse library item.
 
@@ -542,6 +591,14 @@ class PulseLibraryItem:
 class PulseQobj:
     """A Pulse Qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, qobj_id, config, experiments, header=None):
         """Instantiate a new Pulse Qobj Object.
 
@@ -567,23 +624,20 @@ class PulseQobj:
     def __repr__(self):
         experiments_str = [repr(x) for x in self.experiments]
         experiments_repr = "[" + ", ".join(experiments_str) + "]"
-        out = "PulseQobj(qobj_id='{}', config={}, experiments={}, header={})".format(
-            self.qobj_id,
-            repr(self.config),
-            experiments_repr,
-            repr(self.header),
+        return (
+            f"PulseQobj(qobj_id='{self.qobj_id}', config={repr(self.config)}, "
+            f"experiments={experiments_repr}, header={repr(self.header)})"
         )
-        return out
 
     def __str__(self):
-        out = "Pulse Qobj: %s:\n" % self.qobj_id
+        out = f"Pulse Qobj: {self.qobj_id}:\n"
         config = pprint.pformat(self.config.to_dict())
-        out += "Config: %s\n" % str(config)
+        out += f"Config: {str(config)}\n"
         header = pprint.pformat(self.header.to_dict())
-        out += "Header: %s\n" % str(header)
+        out += f"Header: {str(header)}\n"
         out += "Experiments:\n"
         for experiment in self.experiments:
-            out += "%s" % str(experiment)
+            out += str(experiment)
         return out
 
     def to_dict(self):

qiskit/qobj/qasm_qobj.py

@@ -18,11 +18,20 @@ from types import SimpleNamespace
 from qiskit.circuit.parameterexpression import ParameterExpression
 from qiskit.qobj.pulse_qobj import PulseQobjInstruction, PulseLibraryItem
 from qiskit.qobj.common import QobjDictField, QobjHeader
+from qiskit.utils import deprecate_func
 
 
 class QasmQobjInstruction:
     """A class representing a single instruction in an QasmQobj Experiment."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         name,
@@ -131,7 +140,7 @@ class QasmQobjInstruction:
         return out_dict
 
     def __repr__(self):
-        out = "QasmQobjInstruction(name='%s'" % self.name
+        out = f"QasmQobjInstruction(name='{self.name}'"
         for attr in [
             "params",
             "qubits",
@@ -155,7 +164,7 @@ class QasmQobjInstruction:
         return out
 
     def __str__(self):
-        out = "Instruction: %s\n" % self.name
+        out = f"Instruction: {self.name}\n"
         for attr in [
             "params",
             "qubits",
@@ -200,6 +209,14 @@ class QasmQobjExperiment:
     part of a larger OpenQASM 2 qobj.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, config=None, header=None, instructions=None):
         """Instantiate a QasmQobjExperiment.
 
@@ -215,21 +232,19 @@ class QasmQobjExperiment:
     def __repr__(self):
         instructions_str = [repr(x) for x in self.instructions]
         instructions_repr = "[" + ", ".join(instructions_str) + "]"
-        out = "QasmQobjExperiment(config={}, header={}, instructions={})".format(
-            repr(self.config),
-            repr(self.header),
-            instructions_repr,
+        return (
+            f"QasmQobjExperiment(config={repr(self.config)}, header={repr(self.header)},"
+            f" instructions={instructions_repr})"
         )
-        return out
 
     def __str__(self):
         out = "\nOpenQASM2 Experiment:\n"
         config = pprint.pformat(self.config.to_dict())
         header = pprint.pformat(self.header.to_dict())
-        out += "Header:\n%s\n" % header
-        out += "Config:\n%s\n\n" % config
+        out += f"Header:\n{header}\n"
+        out += f"Config:\n{config}\n\n"
         for instruction in self.instructions:
-            out += "\t%s\n" % instruction
+            out += f"\t{instruction}\n"
         return out
 
     def to_dict(self):
@@ -278,6 +293,14 @@ class QasmQobjExperiment:
 class QasmQobjConfig(SimpleNamespace):
     """A configuration for an OpenQASM 2 Qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(
         self,
         shots=None,
@@ -412,6 +435,14 @@ class QasmQobjExperimentHeader(QobjDictField):
 class QasmQobjExperimentConfig(QobjDictField):
     """Configuration for a single OpenQASM 2 experiment in the qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, calibrations=None, qubit_lo_freq=None, meas_lo_freq=None, **kwargs):
         """
         Args:
@@ -448,6 +479,14 @@ class QasmExperimentCalibrations:
     GateCalibrations.
     """
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, gates):
         """
         Initialize a container for calibrations.
@@ -488,6 +527,14 @@ class GateCalibration:
     """Each calibration specifies a unique gate by name, qubits and params, and
     contains the Pulse instructions to implement it."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, name, qubits, params, instructions):
         """
         Initialize a single gate calibration. Instructions may reference waveforms which should be
@@ -543,6 +590,14 @@ class GateCalibration:
 class QasmQobj:
     """An OpenQASM 2 Qobj."""
 
+    @deprecate_func(
+        since="1.2",
+        removal_timeline="in the 2.0 release",
+        additional_msg="The `Qobj` class and related functionality are part of the deprecated "
+        "`BackendV1` workflow,  and no longer necessary for `BackendV2`. If a user "
+        "workflow requires `Qobj` it likely relies on deprecated functionality and "
+        "should be updated to use `BackendV2`.",
+    )
     def __init__(self, qobj_id=None, config=None, experiments=None, header=None):
         """Instantiate a new OpenQASM 2 Qobj Object.
 
@@ -568,23 +623,20 @@ class QasmQobj:
     def __repr__(self):
         experiments_str = [repr(x) for x in self.experiments]
         experiments_repr = "[" + ", ".join(experiments_str) + "]"
-        out = "QasmQobj(qobj_id='{}', config={}, experiments={}, header={})".format(
-            self.qobj_id,
-            repr(self.config),
-            experiments_repr,
-            repr(self.header),
+        return (
+            f"QasmQobj(qobj_id='{self.qobj_id}', config={repr(self.config)},"
+            f" experiments={experiments_repr}, header={repr(self.header)})"
         )
-        return out
 
     def __str__(self):
-        out = "QASM Qobj: %s:\n" % self.qobj_id
+        out = f"QASM Qobj: {self.qobj_id}:\n"
         config = pprint.pformat(self.config.to_dict())
-        out += "Config: %s\n" % str(config)
+        out += f"Config: {str(config)}\n"
         header = pprint.pformat(self.header.to_dict())
-        out += "Header: %s\n" % str(header)
+        out += f"Header: {str(header)}\n"
         out += "Experiments:\n"
         for experiment in self.experiments:
-            out += "%s" % str(experiment)
+            out += str(experiment)
         return out
 
     def to_dict(self):

qiskit/qobj/utils.py

@@ -14,7 +14,16 @@
 
 from enum import Enum, IntEnum
 
+from qiskit.utils import deprecate_func
 
+
+@deprecate_func(
+    since="1.2",
+    removal_timeline="in the 2.0 release",
+    additional_msg="The `Qobj` class and related functionality are part of the deprecated `BackendV1` "
+    "workflow,  and no longer necessary for `BackendV2`. If a user workflow requires `Qobj` it likely "
+    "relies on deprecated functionality and should be updated to use `BackendV2`.",
+)
 class QobjType(str, Enum):
     """Qobj.type allowed values."""
 

qiskit/qpy/__init__.py

@@ -774,7 +774,7 @@ In addition, new payload MAP_ITEM is defined to implement the :ref:`qpy_mapping`
 
 With the support of :class:`.~ScheduleBlock`, now :class:`~.QuantumCircuit` can be
 serialized together with :attr:`~.QuantumCircuit.calibrations`, or
-`Pulse Gates <https://docs.quantum.ibm.com/build/pulse>`_.
+`Pulse Gates <https://docs.quantum.ibm.com/guides/pulse>`_.
 In QPY version 5 and above, :ref:`qpy_circuit_calibrations` payload is
 packed after the :ref:`qpy_instructions` block.
 

qiskit/qpy/binary_io/circuits.py

@@ -128,7 +128,7 @@ def _read_registers_v4(file_obj, num_registers):
             )
         )
         name = file_obj.read(data.name_size).decode("utf8")
-        REGISTER_ARRAY_PACK = "!%sq" % data.size
+        REGISTER_ARRAY_PACK = f"!{data.size}q"
         bit_indices_raw = file_obj.read(struct.calcsize(REGISTER_ARRAY_PACK))
         bit_indices = list(struct.unpack(REGISTER_ARRAY_PACK, bit_indices_raw))
         if data.type.decode("utf8") == "q":
@@ -148,7 +148,7 @@ def _read_registers(file_obj, num_registers):
             )
         )
         name = file_obj.read(data.name_size).decode("utf8")
-        REGISTER_ARRAY_PACK = "!%sI" % data.size
+        REGISTER_ARRAY_PACK = f"!{data.size}I"
         bit_indices_raw = file_obj.read(struct.calcsize(REGISTER_ARRAY_PACK))
         bit_indices = list(struct.unpack(REGISTER_ARRAY_PACK, bit_indices_raw))
         if data.type.decode("utf8") == "q":
@@ -352,7 +352,7 @@ def _read_instruction(
     elif gate_name == "Clifford":
         gate_class = Clifford
     else:
-        raise AttributeError("Invalid instruction type: %s" % gate_name)
+        raise AttributeError(f"Invalid instruction type: {gate_name}")
 
     if instruction.label_size <= 0:
         label = None
@@ -397,6 +397,8 @@ def _read_instruction(
             "DiagonalGate",
         }:
             gate = gate_class(params)
+        elif gate_name == "QFTGate":
+            gate = gate_class(len(qargs), *params)
         else:
             if gate_name == "Barrier":
                 params = [len(qargs)]
@@ -446,6 +448,7 @@ def _parse_custom_operation(
         ) = custom_operations[gate_name]
     else:
         type_str, num_qubits, num_clbits, definition = custom_operations[gate_name]
+        base_gate_raw = ctrl_state = num_ctrl_qubits = None
     # Strip the trailing "_{uuid}" from the gate name if the version >=11
     if version >= 11:
         gate_name = "_".join(gate_name.split("_")[:-1])
@@ -506,7 +509,7 @@ def _parse_custom_operation(
     if type_key == type_keys.CircuitInstruction.PAULI_EVOL_GATE:
         return definition
 
-    raise ValueError("Invalid custom instruction type '%s'" % type_str)
+    raise ValueError(f"Invalid custom instruction type '{type_str}'")
 
 
 def _read_pauli_evolution_gate(file_obj, version, vectors):
@@ -1030,7 +1033,7 @@ def _write_registers(file_obj, in_circ_regs, full_bits):
                 )
             )
             file_obj.write(reg_name)
-            REGISTER_ARRAY_PACK = "!%sq" % reg.size
+            REGISTER_ARRAY_PACK = f"!{reg.size}q"
             bit_indices = []
             for bit in reg:
                 bit_indices.append(bitmap.get(bit, -1))

qiskit/qpy/binary_io/schedules.py

@@ -522,7 +522,7 @@ def read_schedule_block(file_obj, version, metadata_deserializer=None, use_symen
         metadata_deserializer (JSONDecoder): An optional JSONDecoder class
             that will be used for the ``cls`` kwarg on the internal
             ``json.load`` call used to deserialize the JSON payload used for
-            the :attr:`.ScheduleBlock.metadata` attribute for a schdule block
+            the :attr:`.ScheduleBlock.metadata` attribute for a schedule block
             in the file-like object. If this is not specified the circuit metadata will
             be parsed as JSON with the stdlib ``json.load()`` function using
             the default ``JSONDecoder`` class.

qiskit/qpy/binary_io/value.py

@@ -277,7 +277,7 @@ def _read_parameter_expression(file_obj):
         elif elem_key == type_keys.Value.PARAMETER_EXPRESSION:
             value = common.data_from_binary(binary_data, _read_parameter_expression)
         else:
-            raise exceptions.QpyError("Invalid parameter expression map type: %s" % elem_key)
+            raise exceptions.QpyError(f"Invalid parameter expression map type: {elem_key}")
         symbol_map[symbol] = value
 
     return ParameterExpression(symbol_map, expr_)
@@ -311,7 +311,7 @@ def _read_parameter_expression_v3(file_obj, vectors, use_symengine):
         elif symbol_key == type_keys.Value.PARAMETER_VECTOR:
             symbol = _read_parameter_vec(file_obj, vectors)
         else:
-            raise exceptions.QpyError("Invalid parameter expression map type: %s" % symbol_key)
+            raise exceptions.QpyError(f"Invalid parameter expression map type: {symbol_key}")
 
         elem_key = type_keys.Value(elem_data.type)
         binary_data = file_obj.read(elem_data.size)
@@ -331,7 +331,7 @@ def _read_parameter_expression_v3(file_obj, vectors, use_symengine):
                 use_symengine=use_symengine,
             )
         else:
-            raise exceptions.QpyError("Invalid parameter expression map type: %s" % elem_key)
+            raise exceptions.QpyError(f"Invalid parameter expression map type: {elem_key}")
         symbol_map[symbol] = value
 
     return ParameterExpression(symbol_map, expr_)

qiskit/qpy/interface.py

@@ -304,10 +304,11 @@ def load(
     ):
         warnings.warn(
             "The qiskit version used to generate the provided QPY "
-            "file, %s, is newer than the current qiskit version %s. "
+            f"file, {'.'.join([str(x) for x in qiskit_version])}, "
+            f"is newer than the current qiskit version {__version__}. "
             "This may result in an error if the QPY file uses "
             "instructions not present in this current qiskit "
-            "version" % (".".join([str(x) for x in qiskit_version]), __version__)
+            "version"
         )
 
     if data.qpy_version < 5:

qiskit/qpy/type_keys.py

@@ -159,7 +159,7 @@ class Condition(IntEnum):
     """Type keys for the ``conditional_key`` field of the INSTRUCTION struct."""
 
     # This class is deliberately raw integers and not in terms of ASCII characters for backwards
-    # compatiblity in the form as an old Boolean value was expanded; `NONE` and `TWO_TUPLE` must
+    # compatibility in the form as an old Boolean value was expanded; `NONE` and `TWO_TUPLE` must
     # have the enumeration values 0 and 1.
 
     NONE = 0
@@ -276,7 +276,7 @@ class ScheduleInstruction(TypeKeyBase):
     REFERENCE = b"y"
 
     # 's' is reserved by ScheduleBlock, i.e. block can be nested as an element.
-    # Call instructon is not supported by QPY.
+    # Call instruction is not supported by QPY.
     # This instruction has been excluded from ScheduleBlock instructions with
     # qiskit-terra/#8005 and new instruction Reference will be added instead.
     # Call is only applied to Schedule which is not supported by QPY.