Remove gates that moved to Terra

qiskit/aqua/algorithms/amplitude_amplifiers/grover.py

@@ -30,7 +30,6 @@
 from qiskit.aqua.components.initial_states import Custom
 from qiskit.aqua.components.oracles import Oracle
 from qiskit.aqua.components.initial_states import InitialState
-from qiskit.aqua.circuits.gates import mct  # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)
 

qiskit/aqua/algorithms/factorizers/shor.py

@@ -29,7 +29,6 @@
 from qiskit.aqua.utils import get_subsystem_density_matrix
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.circuits import FourierTransformCircuits as ftc
-from qiskit.aqua.circuits.gates import mcu1  # pylint: disable=unused-import
 from qiskit.aqua.utils import summarize_circuits
 from qiskit.aqua.utils.validation import validate_min
 

qiskit/aqua/circuits/boolean_logical_circuits.py

@@ -22,7 +22,6 @@
 from qiskit.qasm import pi
 
 from qiskit.aqua import AquaError
-from .gates import mct  # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)
 
@@ -261,6 +260,7 @@ class CNF(BooleanLogicNormalForm):
     """
     Class for constructing circuits for Conjunctive Normal Forms
     """
+
     def construct_circuit(
             self,
             circuit=None,
@@ -367,6 +367,7 @@ class DNF(BooleanLogicNormalForm):
     """
     Class for constructing circuits for Disjunctive Normal Forms
     """
+
     def construct_circuit(
             self,
             circuit=None,
@@ -480,6 +481,7 @@ class ESOP(BooleanLogicNormalForm):
     """
     Class for constructing circuits for Exclusive Sum of Products
     """
+
     def construct_circuit(
             self,
             circuit=None,

qiskit/aqua/circuits/gates/__init__.py

@@ -29,35 +29,17 @@
    :toctree: ../stubs/
    :nosignatures:
 
-    mcu1
-    mcrx
-    mcry
-    mcrz
-    mct
     mcmt
     logical_and
     logical_or
-    rccx
-    rcccx
 
 """
 
-from .multi_control_u1_gate import mcu1
-from .multi_control_rotation_gates import mcrx, mcry, mcrz
-from .multi_control_toffoli_gate import mct
 from .multi_control_multi_target_gate import mcmt
 from .boolean_logical_gates import logical_and, logical_or
-from .relative_phase_toffoli import rccx, rcccx
 
 __all__ = [
-    'mcu1',
-    'mcrx',
-    'mcry',
-    'mcrz',
-    'mct',
     'mcmt',
     'logical_and',
     'logical_or',
-    'rccx',
-    'rcccx'
 ]

qiskit/aqua/circuits/gates/boolean_logical_gates.py

@@ -2,7 +2,7 @@
 
 # This code is part of Qiskit.
 #
-# (C) Copyright IBM 2019.
+# (C) Copyright IBM 2019, 2020.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -22,7 +22,6 @@
 from qiskit.qasm import pi
 
 from qiskit.aqua import AquaError
-from .multi_control_toffoli_gate import mct  # pylint: disable=unused-import
 
 logger = logging.getLogger(__name__)