Remove Optional type hint where not applicable

Author: mrossinek

qiskit/chemistry/drivers/fcidumpd/dumper.py

@@ -21,7 +21,7 @@
 
 
 def dump(outpath: str, norb: int, nelec: int, hijs: List[float], hijkls: List[float], einact: float,
-         ms2: Optional[int] = 0, orbsym: Optional[List[int]] = None, isym: Optional[int] = 1
+         ms2: int = 0, orbsym: Optional[List[int]] = None, isym: int = 1
          ) -> None:
     # pylint: disable=wrong-spelling-in-docstring
     """Generates a FCIDump output.
@@ -70,7 +70,7 @@ def dump(outpath: str, norb: int, nelec: int, hijs: List[float], hijkls: List[fl
 
 
 def _dump_1e_ints(hij: List[float], mos: List[int], outfile: TextIOWrapper,
-                  beta: Optional[bool] = False) -> None:
+                  beta: bool = False) -> None:
     idx_offset = 1 if not beta else 1+len(mos)
     hij_elements = set()
     for i, j in itertools.product(mos, repeat=2):
@@ -84,7 +84,7 @@ def _dump_1e_ints(hij: List[float], mos: List[int], outfile: TextIOWrapper,
 
 
 def _dump_2e_ints(hijkl: List[float], mos: List[int], outfile: TextIOWrapper,
-                  beta: Optional[int] = 0) -> None:
+                  beta: int = 0) -> None:
     idx_offsets = [1, 1]
     for b in range(beta):
         idx_offsets[1-b] += len(mos)

qiskit/chemistry/drivers/fcidumpd/fcidumpdriver.py

@@ -90,7 +90,7 @@ def run(self) -> QMolecule:
 
     @staticmethod
     def dump(q_mol: QMolecule, outpath: str, orbsym: Optional[List[int]] = None,
-             isym: Optional[int] = 1) -> None:
+             isym: int = 1) -> None:
         """Convenience method to produce an FCIDump output file.
 
         Args:

qiskit/chemistry/drivers/fcidumpd/parser.py

@@ -14,7 +14,7 @@
 
 """FCIDump parser."""
 
-from typing import Any, Dict, List, Optional, Set
+from typing import Any, Dict, List, Set
 import itertools
 import re
 import numpy as np
@@ -196,15 +196,15 @@ def parse(fcidump: str) -> Dict[str, Any]:
 
 
 def _permute_1e_ints(hij: List[float], elements: Set[int], norb: int,
-                     beta: Optional[bool] = False) -> None:
+                     beta: bool = False) -> None:
     for elem in elements.copy():
         shifted = tuple(e-(beta * norb) for e in elem)
         hij[shifted] = hij[shifted[::-1]]
         elements.remove(elem)
 
 
 def _permute_2e_ints(hijkl: List[float], elements: Set[int], norb: int,
-                     beta: Optional[bool] = False) -> None:
+                     beta: bool = False) -> None:
     # pylint: disable=wrong-spelling-in-comment
     for elem in elements.copy():
         shifted = tuple(e-((e >= norb) * norb) for e in elem)