Fix import path

mtreinish · mtreinish · commit b818da6c5066 · 2020-10-06T15:09:50.000-04:00
diff --git a/qiskit/aqua/algorithms/amplitude_estimators/ae.py b/qiskit/aqua/algorithms/amplitude_estimators/ae.py
@@ -23,7 +23,7 @@
 from qiskit import QuantumCircuit, ClassicalRegister
 from qiskit.circuit.library import QFT
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils import CircuitFactory
 from qiskit.aqua.circuits import PhaseEstimationCircuit
diff --git a/qiskit/aqua/algorithms/amplitude_estimators/ae_algorithm.py b/qiskit/aqua/algorithms/amplitude_estimators/ae_algorithm.py
@@ -20,7 +20,7 @@
 from qiskit.circuit import QuantumCircuit
 from qiskit.circuit.library import GroverOperator
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm, AlgorithmResult
 from qiskit.aqua.utils import CircuitFactory
diff --git a/qiskit/aqua/algorithms/amplitude_estimators/iqae.py b/qiskit/aqua/algorithms/amplitude_estimators/iqae.py
@@ -20,7 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils.circuit_factory import CircuitFactory
 from qiskit.aqua.utils.validation import validate_range, validate_in_set
diff --git a/qiskit/aqua/algorithms/amplitude_estimators/mlae.py b/qiskit/aqua/algorithms/amplitude_estimators/mlae.py
@@ -20,7 +20,7 @@
 from scipy.stats import norm, chi2
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils.circuit_factory import CircuitFactory
diff --git a/qiskit/aqua/algorithms/classifiers/qsvm/qsvm.py b/qiskit/aqua/algorithms/classifiers/qsvm/qsvm.py
@@ -23,7 +23,7 @@
 from qiskit.tools.events import TextProgressBar
 from qiskit.circuit import ParameterVector
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, aqua_globals
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua import AquaError
diff --git a/qiskit/aqua/algorithms/classifiers/vqc.py b/qiskit/aqua/algorithms/classifiers/vqc.py
@@ -23,7 +23,7 @@
 from qiskit.circuit import ParameterVector, ParameterExpression
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError, aqua_globals
 from qiskit.aqua.utils import map_label_to_class_name
 from qiskit.aqua.utils import split_dataset_to_data_and_labels
diff --git a/qiskit/aqua/algorithms/distribution_learners/qgan.py b/qiskit/aqua/algorithms/distribution_learners/qgan.py
@@ -22,7 +22,7 @@
 
 from qiskit.circuit import QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError, aqua_globals
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.components.neural_networks.discriminative_network import DiscriminativeNetwork
diff --git a/qiskit/aqua/algorithms/education/bernstein_vazirani.py b/qiskit/aqua/algorithms/education/bernstein_vazirani.py
@@ -20,7 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
diff --git a/qiskit/aqua/algorithms/education/deutsch_jozsa.py b/qiskit/aqua/algorithms/education/deutsch_jozsa.py
@@ -20,7 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
diff --git a/qiskit/aqua/algorithms/education/eoh.py b/qiskit/aqua/algorithms/education/eoh.py
@@ -18,7 +18,7 @@
 from typing import Optional, Union, Dict, Any
 from qiskit import QuantumRegister
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.operators.legacy import op_converter
diff --git a/qiskit/aqua/algorithms/education/simon.py b/qiskit/aqua/algorithms/education/simon.py
@@ -20,7 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
diff --git a/qiskit/aqua/algorithms/factorizers/shor.py b/qiskit/aqua/algorithms/factorizers/shor.py
@@ -23,7 +23,7 @@
 from qiskit.circuit import Gate, Instruction, ParameterVector
 from qiskit.circuit.library import QFT
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import AlgorithmResult, QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix, summarize_circuits
diff --git a/qiskit/aqua/algorithms/linear_solvers/hhl.py b/qiskit/aqua/algorithms/linear_solvers/hhl.py
@@ -20,7 +20,7 @@
 from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit
 from qiskit.dagcircuit import DAGCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.ignis.verification.tomography import state_tomography_circuits, \
diff --git a/qiskit/aqua/algorithms/minimum_eigen_solvers/iqpe.py b/qiskit/aqua/algorithms/minimum_eigen_solvers/iqpe.py
@@ -22,7 +22,7 @@
 from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit
 from qiskit.quantum_info import Pauli
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import (WeightedPauliOperator, suzuki_expansion_slice_pauli_list,
                                    evolution_instruction)
diff --git a/qiskit/aqua/algorithms/minimum_eigen_solvers/qaoa/qaoa.py b/qiskit/aqua/algorithms/minimum_eigen_solvers/qaoa/qaoa.py
@@ -17,7 +17,7 @@
 import numpy as np
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import OperatorBase, ExpectationBase, LegacyBaseOperator
 from qiskit.aqua.components.initial_states import InitialState
diff --git a/qiskit/aqua/algorithms/minimum_eigen_solvers/qpe.py b/qiskit/aqua/algorithms/minimum_eigen_solvers/qpe.py
@@ -20,7 +20,7 @@
 from qiskit.quantum_info import Pauli
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import op_converter, OperatorBase
 from qiskit.aqua.utils import get_subsystem_density_matrix
diff --git a/qiskit/aqua/algorithms/minimum_eigen_solvers/vqe.py b/qiskit/aqua/algorithms/minimum_eigen_solvers/vqe.py
@@ -25,7 +25,7 @@
 from qiskit.circuit import Parameter
 from qiskit.circuit.library import RealAmplitudes
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.operators import (OperatorBase, ExpectationBase, ExpectationFactory, StateFn,
diff --git a/qiskit/aqua/algorithms/quantum_algorithm.py b/qiskit/aqua/algorithms/quantum_algorithm.py
@@ -21,7 +21,7 @@ class in this module.
 from abc import ABC, abstractmethod
 from typing import Union, Dict, Optional
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2.backend import Backend
+from qiskit.providers.backend import Backend
 from qiskit.aqua import aqua_globals, QuantumInstance, AquaError
 
 
diff --git a/qiskit/aqua/algorithms/vq_algorithm.py b/qiskit/aqua/algorithms/vq_algorithm.py
@@ -29,7 +29,7 @@
 
 from qiskit.circuit import QuantumCircuit, ParameterVector
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import AlgorithmResult, QuantumAlgorithm
 from qiskit.aqua.components.optimizers import Optimizer, SLSQP
diff --git a/qiskit/aqua/operators/converters/circuit_sampler.py b/qiskit/aqua/operators/converters/circuit_sampler.py
@@ -18,7 +18,7 @@
 from time import time
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.circuit import QuantumCircuit, Parameter, ParameterExpression
 from qiskit import QiskitError
 from qiskit.aqua import QuantumInstance
diff --git a/qiskit/aqua/operators/expectations/expectation_factory.py b/qiskit/aqua/operators/expectations/expectation_factory.py
@@ -17,7 +17,7 @@
 
 from qiskit import BasicAer
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua.utils.backend_utils import (is_statevector_backend,
                                              is_aer_qasm,
                                              has_aer)
diff --git a/qiskit/aqua/utils/run_circuits.py b/qiskit/aqua/utils/run_circuits.py
@@ -21,7 +21,7 @@
 
 import numpy as np
 from qiskit.providers import BaseBackend, JobStatus, JobError
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.providers.jobstatus import JOB_FINAL_STATES
 from qiskit.providers.basicaer import BasicAerJob
 from qiskit.qobj import QasmQobj
diff --git a/qiskit/chemistry/algorithms/eigen_solvers/q_eom_vqe.py b/qiskit/chemistry/algorithms/eigen_solvers/q_eom_vqe.py
@@ -18,7 +18,7 @@
 import numpy as np
 from qiskit.circuit import QuantumCircuit
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import VQE
 from qiskit.aqua.operators import LegacyBaseOperator, Z2Symmetries
diff --git a/qiskit/chemistry/algorithms/minimum_eigen_solvers/vqe_adapt.py b/qiskit/chemistry/algorithms/minimum_eigen_solvers/vqe_adapt.py
@@ -21,7 +21,7 @@
 import numpy as np
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit import ClassicalRegister
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.algorithms import VQAlgorithm, VQE, VQEResult
diff --git a/qiskit/chemistry/applications/molecular_ground_state_energy.py b/qiskit/chemistry/applications/molecular_ground_state_energy.py
@@ -15,7 +15,7 @@
 from typing import List, Optional, Callable, Union
 
 from qiskit.providers import BaseBackend
-from qiskit.providers.v2 import Backend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import MinimumEigensolver, VQE
 from qiskit.aqua.operators import Z2Symmetries
