Revert "Add ruff rule UP031 Use format specifiers instead of percent format"

jlapeyre · jlapeyre · commit 83b8ddfeca9f · 2023-03-06T22:19:32.000-05:00
This reverts commit 2863fd4. The reason for making these changes is not clear. A desired policy for formatting should be decided if we want to enforce a rule.
diff --git a/pyproject.toml b/pyproject.toml
@@ -52,7 +52,6 @@ select = [
   "UP018", # Unnecessary call to `bytes`. (Using b'' instead of bytes() is much faster)
   "UP034", # Avoid extraneous parentheses
   "UP032", # Use f-string instead of format call
-  "UP031", # Use format specifiers instead of percent format
   "YTT",   # misuse of sys.version or sys.version_info
   "C4",    # flake8-comprehensions, several rules
   "DTZ003", # use of `datetime.datetime.utcnow()` is not allowed, use `datetime.datetime.now(tz=)` instead
diff --git a/qiskit/circuit/library/data_preparation/state_preparation.py b/qiskit/circuit/library/data_preparation/state_preparation.py
@@ -145,8 +145,8 @@ def _define_from_int(self):
         # Raise if number of bits is greater than num_qubits
         if len(intstr) > self.num_qubits:
             raise QiskitError(
-                "StatePreparation integer has {} bits, but this exceeds the"
-                " number of qubits in the circuit, {}.".format(len(intstr), self.num_qubits)
+                "StatePreparation integer has %s bits, but this exceeds the"
+                " number of qubits in the circuit, %s." % (len(intstr), self.num_qubits)
             )
 
         for qubit, bit in enumerate(intstr):
diff --git a/qiskit/circuit/quantumcircuit.py b/qiskit/circuit/quantumcircuit.py
@@ -239,8 +239,8 @@ def __init__(
 
             if not valid_reg_size:
                 raise CircuitError(
-                    "Circuit args must be Registers or integers. ({} '{}' was "
-                    "provided)".format([type(reg).__name__ for reg in regs], regs)
+                    "Circuit args must be Registers or integers. (%s '%s' was "
+                    "provided)" % ([type(reg).__name__ for reg in regs], regs)
                 )
 
             regs = tuple(int(reg) for reg in regs)  # cast to int
@@ -1385,7 +1385,7 @@ def add_register(self, *regs: Union[Register, int, Sequence[Bit]]) -> None:
                 raise CircuitError(
                     "QuantumCircuit parameters can be Registers or Integers."
                     " If Integers, up to 2 arguments. QuantumCircuit was called"
-                    " with {}.".format(regs)
+                    " with %s." % (regs,)
                 )
 
         for register in regs:
diff --git a/qiskit/circuit/register.py b/qiskit/circuit/register.py
@@ -80,7 +80,7 @@ def __init__(self, size=None, name=None, bits=None):
         if (size, bits) == (None, None) or (size is not None and bits is not None):
             raise CircuitError(
                 "Exactly one of the size or bits arguments can be "
-                "provided. Provided size={} bits={}.".format(size, bits)
+                "provided. Provided size=%s bits=%s." % (size, bits)
             )
 
         # validate (or cast) size
diff --git a/qiskit/compiler/assembler.py b/qiskit/compiler/assembler.py
@@ -326,8 +326,8 @@ def _parse_common_args(
         raise QiskitError("Argument 'shots' should be of type 'int'")
     elif max_shots and max_shots < shots:
         raise QiskitError(
-            "Number of shots specified: {} exceeds max_shots property of the "
-            "backend: {}.".format(shots, max_shots)
+            "Number of shots specified: %s exceeds max_shots property of the "
+            "backend: %s." % (shots, max_shots)
         )
 
     dynamic_reprate_enabled = getattr(backend_config, "dynamic_reprate_enabled", False)
diff --git a/qiskit/qpy/interface.py b/qiskit/qpy/interface.py
@@ -248,10 +248,10 @@ def load(
     ):
         warnings.warn(
             "The qiskit version used to generate the provided QPY "
-            "file, {}, is newer than the current qiskit version {}. "
+            "file, %s, is newer than the current qiskit version %s. "
             "This may result in an error if the QPY file uses "
             "instructions not present in this current qiskit "
-            "version".format(".".join([str(x) for x in qiskit_version]), __version__)
+            "version" % (".".join([str(x) for x in qiskit_version]), __version__)
         )
 
     if data.qpy_version < 5:
diff --git a/qiskit/test/base.py b/qiskit/test/base.py
@@ -79,21 +79,21 @@ def setUp(self):
         super().setUp()
         if self.__setup_called:
             raise ValueError(
-                "In File: {}\n"
+                "In File: %s\n"
                 "TestCase.setUp was already called. Do not explicitly call "
                 "setUp from your tests. In your own setUp, use super to call "
-                "the base setUp.".format(sys.modules[self.__class__.__module__].__file__)
+                "the base setUp." % (sys.modules[self.__class__.__module__].__file__,)
             )
         self.__setup_called = True
 
     def tearDown(self):
         super().tearDown()
         if self.__teardown_called:
             raise ValueError(
-                "In File: {}\n"
+                "In File: %s\n"
                 "TestCase.tearDown was already called. Do not explicitly call "
                 "tearDown from your tests. In your own tearDown, use super to "
-                "call the base tearDown.".format(sys.modules[self.__class__.__module__].__file__)
+                "call the base tearDown." % (sys.modules[self.__class__.__module__].__file__,)
             )
         self.__teardown_called = True
 
diff --git a/qiskit/transpiler/layout.py b/qiskit/transpiler/layout.py
@@ -97,8 +97,8 @@ def order_based_on_type(value1, value2):
             virtual = value1
         else:
             raise LayoutError(
-                "The map ({} -> {}) has to be a (Bit -> integer)"
-                " or the other way around.".format(type(value1), type(value2))
+                "The map (%s -> %s) has to be a (Bit -> integer)"
+                " or the other way around." % (type(value1), type(value2))
             )
         return virtual, physical
 
@@ -136,7 +136,7 @@ def __delitem__(self, key):
         else:
             raise LayoutError(
                 "The key to remove should be of the form"
-                " Qubit or integer) and {} was provided".format(type(key))
+                " Qubit or integer) and %s was provided" % (type(key),)
             )
 
     def __len__(self):
diff --git a/qiskit/transpiler/passes/basis/unroll_custom_definitions.py b/qiskit/transpiler/passes/basis/unroll_custom_definitions.py
@@ -100,9 +100,9 @@ def run(self, dag):
 
                 # opaque node
                 raise QiskitError(
-                    "Cannot unroll the circuit to the given basis, {}. "
-                    "Instruction {} not found in equivalence library "
-                    "and no rule found to expand.".format(str(self._basis_gates), node.op.name)
+                    "Cannot unroll the circuit to the given basis, %s. "
+                    "Instruction %s not found in equivalence library "
+                    "and no rule found to expand." % (str(self._basis_gates), node.op.name)
                 )
             decomposition = circuit_to_dag(node.op.definition)
             unrolled_dag = UnrollCustomDefinitions(
diff --git a/qiskit/transpiler/passes/basis/unroller.py b/qiskit/transpiler/passes/basis/unroller.py
@@ -134,8 +134,8 @@ def run(self, dag):
                         continue
                     # opaque node
                     raise QiskitError(
-                        "Cannot unroll the circuit to the given basis, {}. "
-                        "No rule to expand instruction {}.".format(str(self.basis), node.op.name)
+                        "Cannot unroll the circuit to the given basis, %s. "
+                        "No rule to expand instruction %s." % (str(self.basis), node.op.name)
                     )
                 decomposition = circuit_to_dag(node.op.definition)
                 unrolled_dag = self.run(decomposition)  # recursively unroll ops
diff --git a/qiskit/transpiler/runningpassmanager.py b/qiskit/transpiler/runningpassmanager.py
@@ -218,7 +218,7 @@ def _run_this_pass(self, pass_, dag):
             else:
                 raise TranspilerError(
                     "Transformation passes should return a transformed dag."
-                    "The pass {} is returning a {}".format(type(pass_).__name__, type(new_dag))
+                    "The pass %s is returning a %s" % (type(pass_).__name__, type(new_dag))
                 )
             dag = new_dag
         elif pass_.is_analysis_pass:
diff --git a/qiskit/visualization/circuit/latex.py b/qiskit/visualization/circuit/latex.py
@@ -591,9 +591,7 @@ def _build_measure(self, node, col):
             else:
                 wire2 = self._wire_map[node.cargs[0]]
 
-            self._latex[wire2][
-                col
-            ] = "\\dstick{{_{{_{{\\hspace{{{}em}}{}}}}}}} \\cw \\ar @{{<=}} [-{},0]".format(
+            self._latex[wire2][col] = "\\dstick{_{_{\\hspace{%sem}%s}}} \\cw \\ar @{<=} [-%s,0]" % (
                 cond_offset,
                 idx_str,
                 str(wire2 - wire1),
@@ -664,9 +662,7 @@ def _add_condition(self, op, wire_list, col):
             )
             gap = cwire - max(wire_list)
             control = "\\control" if op.condition[1] else "\\controlo"
-            self._latex[cwire][
-                col
-            ] = f"{control}" + " \\cw^({}){{^{{\\mathtt{{{}}}}}}} \\cwx[-{}]".format(
+            self._latex[cwire][col] = f"{control}" + " \\cw^(%s){^{\\mathtt{%s}}} \\cwx[-%s]" % (
                 meas_offset,
                 label,
                 str(gap),
diff --git a/qiskit/visualization/counts_visualization.py b/qiskit/visualization/counts_visualization.py
@@ -287,7 +287,8 @@ def _plotting_core(
 
     if legend and len(legend) != len(data):
         raise VisualizationError(
-            f"Length of legend ({len(legend)}) doesn't match number of input executions ({len(data)})."
+            "Length of legend (%s) doesn't match "
+            "number of input executions: %s" % (len(legend), len(data))
         )
 
     # Set bar colors
diff --git a/test/ipynb/results.py b/test/ipynb/results.py
@@ -185,8 +185,8 @@ def _repr_html_(self):
                     )
             else:
                 title = (
-                    'Download <a download="{}" href="{}">this image</a> to <tt>{}</tt>'
-                    " and add/push to the repo</td>".format(name, fullpath_name, fullpath_reference)
+                    'Download <a download="%s" href="%s">this image</a> to <tt>%s</tt>'
+                    " and add/push to the repo</td>" % (name, fullpath_name, fullpath_reference)
                 )
                 ret += Results.no_reference_html(fullpath_name, title)
         ret += "</div>"
diff --git a/test/python/basicaer/test_basicaer_backends.py b/test/python/basicaer/test_basicaer_backends.py
@@ -41,8 +41,8 @@ def _get_first_available_backend(provider, backend_names):
         deprecated_names = BasicAer._deprecated_backend_names()
         for oldname, newname in deprecated_names.items():
             expected = (
-                "WARNING:qiskit.providers.providerutils:Backend '{}' is deprecated. "
-                "Use '{}'.".format(oldname, newname)
+                "WARNING:qiskit.providers.providerutils:Backend '%s' is deprecated. "
+                "Use '%s'." % (oldname, newname)
             )
             with self.subTest(oldname=oldname, newname=newname):
                 with self.assertLogs("qiskit.providers.providerutils", level="WARNING") as context:

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def __init__(self, size=None, name=None, bits=None):`
`80`	`80`	`if (size, bits) == (None, None) or (size is not None and bits is not None):`
`81`	`81`	`raise CircuitError(`
`82`	`82`	`"Exactly one of the size or bits arguments can be "`
`83`		`- "provided. Provided size={} bits={}.".format(size, bits)`
	`83`	`+ "provided. Provided size=%s bits=%s." % (size, bits)`
`84`	`84`	`)`
`85`	`85`
`86`	`86`	`# validate (or cast) size`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ def _run_this_pass(self, pass_, dag):`
`218`	`218`	`else:`
`219`	`219`	`raise TranspilerError(`
`220`	`220`	`"Transformation passes should return a transformed dag."`
`221`		`- "The pass {} is returning a {}".format(type(pass_).__name__, type(new_dag))`
	`221`	`+ "The pass %s is returning a %s" % (type(pass_).__name__, type(new_dag))`
`222`	`222`	`)`
`223`	`223`	`dag = new_dag`
`224`	`224`	`elif pass_.is_analysis_pass:`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,8 @@ def _plotting_core(`
`287`	`287`
`288`	`288`	`if legend and len(legend) != len(data):`
`289`	`289`	`raise VisualizationError(`
`290`		`- f"Length of legend ({len(legend)}) doesn't match number of input executions ({len(data)})."`
	`290`	`+ "Length of legend (%s) doesn't match "`
	`291`	`+ "number of input executions: %s" % (len(legend), len(data))`
`291`	`292`	`)`
`292`	`293`
`293`	`294`	`# Set bar colors`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ def _repr_html_(self):`
`185`	`185`	`)`
`186`	`186`	`else:`
`187`	`187`	`title = (`
`188`		`- 'Download <a download="{}" href="{}">this image</a> to <tt>{}</tt>'`
`189`		`- " and add/push to the repo</td>".format(name, fullpath_name, fullpath_reference)`
	`188`	`+ 'Download <a download="%s" href="%s">this image</a> to <tt>%s</tt>'`
	`189`	`+ " and add/push to the repo</td>" % (name, fullpath_name, fullpath_reference)`
`190`	`190`	`)`
`191`	`191`	`ret += Results.no_reference_html(fullpath_name, title)`
`192`	`192`	`ret += "</div>"`