pylint - enable check for f-string-without-interpolation (quantumlib#…

…4706)

Use plain strings when brace expansion is not needed.

cirq-core/cirq/circuits/circuit_operation.py

@@ -106,7 +106,7 @@ def __post_init__(self):
             try:
                 protocols.inverse(self.circuit.unfreeze())
             except TypeError:
-                raise ValueError(f'repetitions are negative but the circuit is not invertible')
+                raise ValueError('repetitions are negative but the circuit is not invertible')
 
         # Initialize repetition_ids to default, if unspecified. Else, validate their length.
         loop_size = abs(self.repetitions)

cirq-core/cirq/circuits/circuit_operation_test.py

@@ -359,7 +359,7 @@ def test_string_format():
     )
     assert (
         repr(op1)
-        == f"""\
+        == """\
 cirq.CircuitOperation(
     circuit=cirq.FrozenCircuit([
         cirq.Moment(
@@ -448,7 +448,7 @@ def test_string_format():
     op5 = cirq.CircuitOperation(fc5)
     assert (
         repr(op5)
-        == f"""\
+        == """\
 cirq.CircuitOperation(
     circuit=cirq.FrozenCircuit([
         cirq.Moment(

cirq-core/cirq/contrib/routing/router.py

@@ -62,5 +62,5 @@ def route_circuit(
     if algo_name is not None:
         router = ROUTERS[algo_name]
     elif router is None:
-        raise ValueError(f'No routing algorithm specified.')
+        raise ValueError('No routing algorithm specified.')
     return router(circuit, device_graph, **kwargs)

cirq-core/cirq/interop/quirk/cells/input_rotation_cells.py

@@ -90,7 +90,7 @@ def controlled_by(self, qubit: 'cirq.Qid'):
 
     def operations(self) -> 'cirq.OP_TREE':
         if self.register is None:
-            raise ValueError(f"Missing input 'a'")
+            raise ValueError("Missing input 'a'")
         return QuirkInputRotationOperation(
             self.identifier, self.register, self.base_operation, self.exponent_sign
         )

cirq-core/cirq/linalg/decompositions_test.py

@@ -564,7 +564,7 @@ def test_scatter_plot_normalized_kak_interaction_coefficients():
     ax = cirq.scatter_plot_normalized_kak_interaction_coefficients(data)
     assert ax is not None
     ax2 = cirq.scatter_plot_normalized_kak_interaction_coefficients(
-        data, s=1, c='blue', ax=ax, include_frame=False, label=f'test'
+        data, s=1, c='blue', ax=ax, include_frame=False, label='test'
     )
     assert ax2 is ax
 

cirq-core/cirq/ops/common_gate_families_test.py

@@ -48,8 +48,8 @@ def test_any_unitary_gate_family():
                 assert f'{init_num_qubits}' in gate_family.description
                 assert UnitaryGate(num_qubits + 1) not in gate_family
             else:
-                assert f'Any-Qubit' in gate_family.name
-                assert f'any unitary' in gate_family.description
+                assert 'Any-Qubit' in gate_family.name
+                assert 'any unitary' in gate_family.description
 
     assert cirq.SingleQubitGate() not in cirq.AnyUnitaryGateFamily()
 

cirq-core/cirq/ops/state_preparation_channel_test.py

@@ -114,7 +114,7 @@ def test_gate_params():
 def test_gate_error_handling():
     with pytest.raises(ValueError, match='`target_state` must be a 1d numpy array.'):
         cirq.StatePreparationChannel(np.eye(2))
-    with pytest.raises(ValueError, match=f'Matrix width \\(5\\) is not a power of 2'):
+    with pytest.raises(ValueError, match='Matrix width \\(5\\) is not a power of 2'):
         cirq.StatePreparationChannel(np.ones(shape=5))
 
 

cirq-core/cirq/optimizers/clifford_decomposition.py

@@ -107,9 +107,7 @@ def decompose_clifford_tableau_to_operations(
         ValueError: The length of input qubit mismatch with the size of tableau.
     """
     if len(qubits) != clifford_tableau.n:
-        raise ValueError(
-            f"The number of qubits must be the same as the number of Clifford Tableau."
-        )
+        raise ValueError("The number of qubits must be the same as the number of Clifford Tableau.")
     assert (
         clifford_tableau._validate()
     ), "The provided clifford_tableau must satisfy the symplectic property."

cirq-core/cirq/protocols/json_serialization_test.py

@@ -675,15 +675,11 @@ def custom_resolver(name):
             return SerializableTypeObject
 
     test_resolvers = [custom_resolver] + cirq.DEFAULT_RESOLVERS
-    invalid_json = (
-        f'{{\n  "cirq_type": "SerializableTypeObject",\n' f'  "test_type": "bad_type"\n}}'
-    )
+    invalid_json = '{\n  "cirq_type": "SerializableTypeObject",\n  "test_type": "bad_type"\n}'
     with pytest.raises(ValueError, match='Could not resolve type'):
         _ = cirq.read_json(json_text=invalid_json, resolvers=test_resolvers)
 
-    factory_json = (
-        f'{{\n  "cirq_type": "SerializableTypeObject",\n' f'  "test_type": "sympy.Add"\n}}'
-    )
+    factory_json = '{\n  "cirq_type": "SerializableTypeObject",\n  "test_type": "sympy.Add"\n}'
     with pytest.raises(ValueError, match='maps to a factory method'):
         _ = cirq.read_json(json_text=factory_json, resolvers=test_resolvers)
 

cirq-core/cirq/testing/consistent_controlled_gate_op.py

@@ -26,7 +26,7 @@ def assert_controlled_and_controlled_by_identical(
     """Checks that gate.on().controlled_by() == gate.controlled().on()"""
     if control_values is not None:
         if len(num_controls) != len(control_values):
-            raise ValueError(f"len(num_controls) != len(control_values)")
+            raise ValueError("len(num_controls) != len(control_values)")
     for i, num_control in enumerate(num_controls):
         control_value = control_values[i] if control_values else None
         if control_value is not None and len(control_value) != num_control:

cirq-core/cirq/testing/no_identifier_qubit.py

@@ -33,7 +33,7 @@ def dimension(self) -> int:
         return 2
 
     def __repr__(self) -> str:
-        return f'cirq.testing.NoIdentifierQubit()'
+        return 'cirq.testing.NoIdentifierQubit()'
 
     def _json_dict_(self) -> Dict[str, Any]:
         return protocols.obj_to_dict_helper(self, [])

cirq-core/cirq/value/measurement_key_test.py

@@ -63,10 +63,10 @@ def test_str(key_string):
 
 def test_repr():
     mkey = cirq.MeasurementKey('key_string')
-    assert repr(mkey) == f"cirq.MeasurementKey(name='key_string')"
+    assert repr(mkey) == "cirq.MeasurementKey(name='key_string')"
     assert eval(repr(mkey)) == mkey
     mkey = cirq.MeasurementKey.parse_serialized('nested:key')
-    assert repr(mkey) == f"cirq.MeasurementKey(path=('nested',), name='key')"
+    assert repr(mkey) == "cirq.MeasurementKey(path=('nested',), name='key')"
     assert eval(repr(mkey)) == mkey
 
 

cirq-google/cirq_google/calibration/phased_fsim.py

@@ -378,7 +378,7 @@ def merge_matching_results(
             )
 
         if not all_parameters.keys().isdisjoint(result.parameters):
-            raise ValueError(f'Only results with disjoint parameters sets can be merged')
+            raise ValueError('Only results with disjoint parameters sets can be merged')
 
         all_parameters.update(result.parameters)
 

cirq-google/cirq_google/calibration/workflow.py

@@ -220,8 +220,8 @@ def _list_moment_pairs_to_characterize(
         return None
     elif not permit_mixed_moments and other_operation:
         raise IncompatibleMomentError(
-            f'Moment contains mixed two-qubit operations and either single-qubit measurement or '
-            f'wait operations. See permit_mixed_moments option to relax this restriction.'
+            'Moment contains mixed two-qubit operations and either single-qubit measurement or '
+            'wait operations. See permit_mixed_moments option to relax this restriction.'
         )
 
     if sort_pairs:

cirq-ionq/cirq_ionq/service.py

@@ -67,8 +67,8 @@ def __init__(
         self.api_key = api_key or os.getenv('IONQ_API_KEY')
         if not self.api_key:
             raise EnvironmentError(
-                f'Parameter api_key was not specified and the environment variable '
-                f'IONQ_API_KEY was also not set.'
+                'Parameter api_key was not specified and the environment variable '
+                'IONQ_API_KEY was also not set.'
             )
 
         self._client = ionq_client._IonQClient(

cirq-rigetti/cirq_rigetti/aspen_device.py

@@ -169,14 +169,12 @@ def validate_qubit(self, qubit: 'cirq.Qid') -> None:
                     )
                 if not ((index % 10) <= 7):
                     raise UnsupportedQubit(
-                        f'this Aspen device only supports qubit indices mod 10 <= 7'
+                        'this Aspen device only supports qubit indices mod 10 <= 7'
                     )
                 return
 
             except ValueError:
-                raise UnsupportedQubit(
-                    f'Aspen devices only support named qubits by octagonal index'
-                )
+                raise UnsupportedQubit('Aspen devices only support named qubits by octagonal index')
 
         if isinstance(qubit, (OctagonalQubit, AspenQubit)):
             if not (qubit.index < self._maximum_qubit_number):
@@ -493,7 +491,7 @@ def from_named_qubit(qubit: cirq.NamedQubit) -> 'AspenQubit':
             index = int(qubit.name)
             return AspenQubit.from_aspen_index(index)
         except ValueError:
-            raise UnsupportedQubit(f'Aspen devices only support named qubits by octagonal index')
+            raise UnsupportedQubit('Aspen devices only support named qubits by octagonal index')
 
     @staticmethod
     def from_aspen_index(index: int) -> 'AspenQubit':

dev_tools/conf/.pylintrc

@@ -19,6 +19,7 @@ enable=
     docstyle,
     duplicate-argument-name,
     expression-not-assigned,
+    f-string-without-interpolation
     function-redefined,
     inconsistent-mro,
     init-is-generator,

dev_tools/modules_test.py

@@ -155,7 +155,7 @@ def test_get_version_on_no_modules():
 def test_get_version_on_inconsistent_version_modules():
     modules.replace_version(search_dir=Path("./mod2"), old="1.2.3.dev", new="1.2.4.dev")
     assert modules.get_version(search_dir=Path("./mod2")) == "1.2.4.dev"
-    with pytest.raises(ValueError, match=f"Versions should be the same, instead:"):
+    with pytest.raises(ValueError, match="Versions should be the same, instead:"):
         modules.get_version(search_dir=Path("."))