Switch to unquoted type annotations files part 5/5

Author: pavoljuhas

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

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import operator
 import re
 from typing import Callable, Iterable, List, TYPE_CHECKING
@@ -86,7 +88,7 @@ def is_valid_routing(
         raise
 
 
-def get_circuit_connectivity(circuit: 'cirq.Circuit') -> nx.Graph:
+def get_circuit_connectivity(circuit: cirq.Circuit) -> nx.Graph:
     """Return a graph of all 2q interactions in a circuit.
 
     Nodes are qubits and undirected edges correspond to any two-qubit

cirq-core/cirq/contrib/svg/svg.py

@@ -1,4 +1,7 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
+
+from __future__ import annotations
+
 from typing import cast, Dict, List, Tuple, TYPE_CHECKING
 
 import matplotlib.font_manager
@@ -59,7 +62,7 @@ def _text(x: float, y: float, text: str, fontsize: int = 14):
 
 
 def _fit_horizontal(
-    tdd: 'cirq.TextDiagramDrawer', ref_boxwidth: float, col_padding: float
+    tdd: cirq.TextDiagramDrawer, ref_boxwidth: float, col_padding: float
 ) -> Tuple[List[float], List[float]]:
     """Figure out the horizontal spacing of columns to fit everything in.
 
@@ -89,7 +92,7 @@ def _fit_horizontal(
 
 
 def _fit_vertical(
-    tdd: 'cirq.TextDiagramDrawer', ref_boxheight: float, row_padding: float
+    tdd: cirq.TextDiagramDrawer, ref_boxheight: float, row_padding: float
 ) -> Tuple[List[float], List[float], Dict[float, int]]:
     """Return data structures used to turn tdd vertical coordinates into
     well-spaced SVG coordinates.
@@ -164,7 +167,7 @@ def _debug_spacing(col_starts, row_starts):  # pragma: no cover
 
 
 def tdd_to_svg(
-    tdd: 'cirq.TextDiagramDrawer',
+    tdd: cirq.TextDiagramDrawer,
     ref_boxwidth: float = 40,
     ref_boxheight: float = 40,
     col_padding: float = 20,
@@ -246,7 +249,7 @@ def tdd_to_svg(
     return t
 
 
-def _validate_circuit(circuit: 'cirq.Circuit'):
+def _validate_circuit(circuit: cirq.Circuit):
     if len(circuit) == 0:
         raise ValueError("Can't draw SVG diagram for empty circuits")
 
@@ -260,14 +263,14 @@ class SVGCircuit:
     which will cause the circuit to be displayed as an SVG image.
     """
 
-    def __init__(self, circuit: 'cirq.Circuit'):
+    def __init__(self, circuit: cirq.Circuit):
         self.circuit = circuit
 
     def _repr_svg_(self) -> str:
         return circuit_to_svg(self.circuit)
 
 
-def circuit_to_svg(circuit: 'cirq.Circuit') -> str:
+def circuit_to_svg(circuit: cirq.Circuit) -> str:
     """Render a circuit as SVG."""
     _validate_circuit(circuit)
     tdd = circuit.to_text_diagram_drawer(transpose=False)

cirq-core/cirq/devices/device.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import abc
 from typing import FrozenSet, Iterable, Optional, TYPE_CHECKING
 
@@ -57,15 +59,15 @@ class Device(metaclass=abc.ABCMeta):
     """
 
     @property
-    def metadata(self) -> Optional['DeviceMetadata']:
+    def metadata(self) -> Optional[DeviceMetadata]:
         """Returns the associated Metadata with the device if applicable.
 
         Returns:
             `cirq.DeviceMetadata` if specified by the device otherwise None.
         """
         return None
 
-    def validate_operation(self, operation: 'cirq.Operation') -> None:
+    def validate_operation(self, operation: cirq.Operation) -> None:
         """Raises an exception if an operation is not valid.
 
         Args:
@@ -75,7 +77,7 @@ def validate_operation(self, operation: 'cirq.Operation') -> None:
             ValueError: The operation isn't valid for this device.
         """
 
-    def validate_circuit(self, circuit: 'cirq.AbstractCircuit') -> None:
+    def validate_circuit(self, circuit: cirq.AbstractCircuit) -> None:
         """Raises an exception if a circuit is not valid.
 
         Args:
@@ -87,7 +89,7 @@ def validate_circuit(self, circuit: 'cirq.AbstractCircuit') -> None:
         for moment in circuit:
             self.validate_moment(moment)
 
-    def validate_moment(self, moment: 'cirq.Moment') -> None:
+    def validate_moment(self, moment: cirq.Moment) -> None:
         """Raises an exception if a moment is not valid.
 
         Args:
@@ -104,7 +106,7 @@ def validate_moment(self, moment: 'cirq.Moment') -> None:
 class DeviceMetadata:
     """Parent type for all device specific metadata classes."""
 
-    def __init__(self, qubits: Iterable['cirq.Qid'], nx_graph: 'nx.Graph'):
+    def __init__(self, qubits: Iterable[cirq.Qid], nx_graph: nx.Graph):
         """Construct a DeviceMetadata object.
 
         Args:
@@ -114,11 +116,11 @@ def __init__(self, qubits: Iterable['cirq.Qid'], nx_graph: 'nx.Graph'):
                 directional coupling, undirected edges indicate bi-directional
                 coupling.
         """
-        self._qubits_set: FrozenSet['cirq.Qid'] = frozenset(qubits)
+        self._qubits_set: FrozenSet[cirq.Qid] = frozenset(qubits)
         self._nx_graph = nx_graph
 
     @property
-    def qubit_set(self) -> FrozenSet['cirq.Qid']:
+    def qubit_set(self) -> FrozenSet[cirq.Qid]:
         """Returns the set of qubits on the device.
 
         Returns:
@@ -127,7 +129,7 @@ def qubit_set(self) -> FrozenSet['cirq.Qid']:
         return self._qubits_set
 
     @property
-    def nx_graph(self) -> 'nx.Graph':
+    def nx_graph(self) -> nx.Graph:
         """Returns a nx.Graph where nodes are qubits and edges are couple-able qubits.
 
         Returns:
@@ -150,6 +152,6 @@ def _json_dict_(self):
         return {'qubits': qubits_payload, 'nx_graph': graph_payload}
 
     @classmethod
-    def _from_json_dict_(cls, qubits: Iterable['cirq.Qid'], nx_graph: 'nx.Graph', **kwargs):
+    def _from_json_dict_(cls, qubits: Iterable[cirq.Qid], nx_graph: nx.Graph, **kwargs):
         graph_obj = nx.readwrite.json_graph.node_link_graph(nx_graph)
         return cls(qubits, graph_obj)

cirq-core/cirq/devices/grid_device_metadata.py

@@ -11,8 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 """Metadata subtype for 2D Homogenous devices."""
 
+from __future__ import annotations
+
 from typing import cast, FrozenSet, Iterable, Mapping, Optional, Tuple, TYPE_CHECKING
 
 import networkx as nx
@@ -30,11 +33,11 @@ class GridDeviceMetadata(device.DeviceMetadata):
 
     def __init__(
         self,
-        qubit_pairs: Iterable[Tuple['cirq.GridQubit', 'cirq.GridQubit']],
-        gateset: 'cirq.Gateset',
-        gate_durations: Optional[Mapping['cirq.GateFamily', 'cirq.Duration']] = None,
-        all_qubits: Optional[Iterable['cirq.GridQubit']] = None,
-        compilation_target_gatesets: Iterable['cirq.CompilationTargetGateset'] = (),
+        qubit_pairs: Iterable[Tuple[cirq.GridQubit, cirq.GridQubit]],
+        gateset: cirq.Gateset,
+        gate_durations: Optional[Mapping[cirq.GateFamily, cirq.Duration]] = None,
+        all_qubits: Optional[Iterable[cirq.GridQubit]] = None,
+        compilation_target_gatesets: Iterable[cirq.CompilationTargetGateset] = (),
     ):
         """Create a GridDeviceMetadata object.
 
@@ -115,7 +118,7 @@ def __init__(
         self._gate_durations = gate_durations
 
     @property
-    def qubit_set(self) -> FrozenSet['cirq.GridQubit']:
+    def qubit_set(self) -> FrozenSet[cirq.GridQubit]:
         """Returns the set of grid qubits on the device.
 
         Returns:
@@ -124,7 +127,7 @@ def qubit_set(self) -> FrozenSet['cirq.GridQubit']:
         return cast(FrozenSet['cirq.GridQubit'], super().qubit_set)
 
     @property
-    def qubit_pairs(self) -> FrozenSet[FrozenSet['cirq.GridQubit']]:
+    def qubit_pairs(self) -> FrozenSet[FrozenSet[cirq.GridQubit]]:
         """Returns the set of all couple-able qubits on the device.
 
         Each element in the outer frozenset is a 2-element frozenset representing a bidirectional
@@ -133,22 +136,22 @@ def qubit_pairs(self) -> FrozenSet[FrozenSet['cirq.GridQubit']]:
         return self._qubit_pairs
 
     @property
-    def isolated_qubits(self) -> FrozenSet['cirq.GridQubit']:
+    def isolated_qubits(self) -> FrozenSet[cirq.GridQubit]:
         """Returns the set of all isolated qubits on the device (if applicable)."""
         return self._isolated_qubits
 
     @property
-    def gateset(self) -> 'cirq.Gateset':
+    def gateset(self) -> cirq.Gateset:
         """Returns the `cirq.Gateset` of supported gates on this device."""
         return self._gateset
 
     @property
-    def compilation_target_gatesets(self) -> Tuple['cirq.CompilationTargetGateset', ...]:
+    def compilation_target_gatesets(self) -> Tuple[cirq.CompilationTargetGateset, ...]:
         """Returns a sequence of valid `cirq.CompilationTargetGateset`s for this device."""
         return self._compilation_target_gatesets
 
     @property
-    def gate_durations(self) -> Optional[Mapping['cirq.GateFamily', 'cirq.Duration']]:
+    def gate_durations(self) -> Optional[Mapping[cirq.GateFamily, cirq.Duration]]:
         """Get a dictionary mapping from gate family to duration for gates.
 
         To look up the duration of a specific gate instance / gate type / operation which is part of

cirq-core/cirq/devices/grid_qubit.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import abc
 import functools
 import weakref
@@ -104,17 +106,17 @@ def col(self) -> int:
     def dimension(self) -> int:
         return self._dimension
 
-    def with_dimension(self, dimension: int) -> 'GridQid':
+    def with_dimension(self, dimension: int) -> GridQid:
         return GridQid(self._row, self._col, dimension=dimension)
 
-    def is_adjacent(self, other: 'cirq.Qid') -> bool:
+    def is_adjacent(self, other: cirq.Qid) -> bool:
         """Determines if two qubits are adjacent qubits."""
         return (
             isinstance(other, GridQubit)
             and abs(self._row - other._row) + abs(self._col - other._col) == 1
         )
 
-    def neighbors(self, qids: Optional[Iterable[ops.Qid]] = None) -> Set['_BaseGridQid']:
+    def neighbors(self, qids: Optional[Iterable[ops.Qid]] = None) -> Set[_BaseGridQid]:
         """Returns qubits that are potential neighbors to this GridQid
 
         Args:
@@ -204,7 +206,7 @@ class GridQid(_BaseGridQid):
     # Holds weak references so instances can still be garbage collected.
     _cache = weakref.WeakValueDictionary[Tuple[int, int, int], 'cirq.GridQid']()
 
-    def __new__(cls, row: int, col: int, *, dimension: int) -> 'cirq.GridQid':
+    def __new__(cls, row: int, col: int, *, dimension: int) -> cirq.GridQid:
         """Creates a grid qid at the given row, col coordinate
 
         Args:
@@ -234,11 +236,11 @@ def __getnewargs_ex__(self):
     def __getstate__(self) -> Dict[str, Any]:
         return {}
 
-    def _with_row_col(self, row: int, col: int) -> 'GridQid':
+    def _with_row_col(self, row: int, col: int) -> GridQid:
         return GridQid(row, col, dimension=self._dimension)
 
     @staticmethod
-    def square(diameter: int, top: int = 0, left: int = 0, *, dimension: int) -> List['GridQid']:
+    def square(diameter: int, top: int = 0, left: int = 0, *, dimension: int) -> List[GridQid]:
         """Returns a square of GridQid.
 
         Args:
@@ -254,9 +256,7 @@ def square(diameter: int, top: int = 0, left: int = 0, *, dimension: int) -> Lis
         return GridQid.rect(diameter, diameter, top=top, left=left, dimension=dimension)
 
     @staticmethod
-    def rect(
-        rows: int, cols: int, top: int = 0, left: int = 0, *, dimension: int
-    ) -> List['GridQid']:
+    def rect(rows: int, cols: int, top: int = 0, left: int = 0, *, dimension: int) -> List[GridQid]:
         """Returns a rectangle of GridQid.
 
         Args:
@@ -277,7 +277,7 @@ def rect(
         ]
 
     @staticmethod
-    def from_diagram(diagram: str, dimension: int) -> List['GridQid']:
+    def from_diagram(diagram: str, dimension: int) -> List[GridQid]:
         """Parse ASCII art device layout into a device.
 
         As an example, the below diagram will create a list of GridQid in a
@@ -337,9 +337,7 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return f"q({self._row}, {self._col}) (d={self._dimension})"
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         return protocols.CircuitDiagramInfo(
             wire_symbols=(f"({self._row}, {self._col}) (d={self._dimension})",)
         )
@@ -371,7 +369,7 @@ class GridQubit(_BaseGridQid):
     # Holds weak references so instances can still be garbage collected.
     _cache = weakref.WeakValueDictionary[Tuple[int, int], 'cirq.GridQubit']()
 
-    def __new__(cls, row: int, col: int) -> 'cirq.GridQubit':
+    def __new__(cls, row: int, col: int) -> cirq.GridQubit:
         """Creates a grid qubit at the given row, col coordinate
 
         Args:
@@ -396,11 +394,11 @@ def __getnewargs__(self):
     def __getstate__(self) -> Dict[str, Any]:
         return {}
 
-    def _with_row_col(self, row: int, col: int) -> 'GridQubit':
+    def _with_row_col(self, row: int, col: int) -> GridQubit:
         return GridQubit(row, col)
 
     @staticmethod
-    def square(diameter: int, top: int = 0, left: int = 0) -> List['GridQubit']:
+    def square(diameter: int, top: int = 0, left: int = 0) -> List[GridQubit]:
         """Returns a square of GridQubits.
 
         Args:
@@ -414,7 +412,7 @@ def square(diameter: int, top: int = 0, left: int = 0) -> List['GridQubit']:
         return GridQubit.rect(diameter, diameter, top=top, left=left)
 
     @staticmethod
-    def rect(rows: int, cols: int, top: int = 0, left: int = 0) -> List['GridQubit']:
+    def rect(rows: int, cols: int, top: int = 0, left: int = 0) -> List[GridQubit]:
         """Returns a rectangle of GridQubits.
 
         Args:
@@ -433,7 +431,7 @@ def rect(rows: int, cols: int, top: int = 0, left: int = 0) -> List['GridQubit']
         ]
 
     @staticmethod
-    def from_diagram(diagram: str) -> List['GridQubit']:
+    def from_diagram(diagram: str) -> List[GridQubit]:
         """Parse ASCII art into device layout info.
 
         As an example, the below diagram will create a list of
@@ -490,9 +488,7 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return f"q({self._row}, {self._col})"
 
-    def _circuit_diagram_info_(
-        self, args: 'cirq.CircuitDiagramInfoArgs'
-    ) -> 'cirq.CircuitDiagramInfo':
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> cirq.CircuitDiagramInfo:
         return protocols.CircuitDiagramInfo(wire_symbols=(f"({self._row}, {self._col})",))
 
     def _json_dict_(self) -> Dict[str, Any]:

cirq-core/cirq/devices/grid_qubit_test.py

@@ -58,7 +58,7 @@ def test_grid_qid_pickled_hash():
     _test_qid_pickled_hash(q, q_bad)
 
 
-def _test_qid_pickled_hash(q: 'cirq.Qid', q_bad: 'cirq.Qid') -> None:
+def _test_qid_pickled_hash(q: cirq.Qid, q_bad: cirq.Qid) -> None:
     """Test that hashes are not pickled with Qid instances."""
     assert q_bad is not q
     _ = hash(q_bad)  # compute hash to ensure it is cached.