Import standard gates from new location (qiskit-community/qiskit-aqua#924)

* import standard gates from new location

* local import for IBMQ

Author: Cryoris

qiskit/aqua/operators/operator_globals.py

@@ -17,7 +17,7 @@
 """
 
 from qiskit.quantum_info import Pauli
-from qiskit.extensions.standard import CXGate, SGate, TGate, HGate, SwapGate, CZGate
+from qiskit.circuit.library import CXGate, SGate, TGate, HGate, SwapGate, CZGate
 
 from .primitive_ops.primitive_op import PrimitiveOp
 from .state_fns.state_fn import StateFn

qiskit/aqua/operators/primitive_ops/circuit_op.py

@@ -19,7 +19,7 @@
 import numpy as np
 
 from qiskit import QuantumCircuit, BasicAer, execute
-from qiskit.extensions.standard import IGate
+from qiskit.circuit.library import IGate
 from qiskit.circuit import Instruction, ParameterExpression
 
 from ..operator_base import OperatorBase

qiskit/aqua/operators/primitive_ops/pauli_op.py

@@ -22,7 +22,7 @@
 from qiskit import QuantumCircuit
 from qiskit.circuit import ParameterExpression, Instruction
 from qiskit.quantum_info import Pauli
-from qiskit.extensions.standard import RZGate, RYGate, RXGate, XGate, YGate, ZGate, IGate
+from qiskit.circuit.library import RZGate, RYGate, RXGate, XGate, YGate, ZGate, IGate
 
 from ..operator_base import OperatorBase
 from .primitive_op import PrimitiveOp

qiskit/aqua/operators/state_fns/circuit_state_fn.py

@@ -20,7 +20,8 @@
 
 from qiskit import QuantumCircuit, BasicAer, execute, ClassicalRegister
 from qiskit.circuit import Instruction, ParameterExpression
-from qiskit.extensions import Initialize, IGate
+from qiskit.extensions import Initialize
+from qiskit.circuit.library import IGate
 
 from ..operator_base import OperatorBase
 from ..list_ops.summed_op import SummedOp