From 45271241b6ef212c7ef3af7991f3b8988f430521 Mon Sep 17 00:00:00 2001
From: cjwood <cjwood@us.ibm.com>
Date: Tue, 18 Dec 2018 11:02:58 -0500
Subject: [PATCH] fix inits

* removed init file in wrappers folder causing error importing wrappers
* change imports for noise and utils to remove import *
* fixed typo in ref_measure for import qobj_utils
---
 qiskit/providers/aer/__init__.py                   | 4 ++--
 qiskit/providers/aer/backends/__init__.py          | 1 -
 qiskit/providers/aer/backends/wrappers/__init__.py | 8 --------
 qiskit/providers/aer/utils/__init__.py             | 2 ++
 test/terra/utils/ref_measure.py                    | 6 +++---
 5 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 qiskit/providers/aer/backends/wrappers/__init__.py

diff --git a/qiskit/providers/aer/__init__.py b/qiskit/providers/aer/__init__.py
index 6052a18a5c..7ea4b51d2d 100644
--- a/qiskit/providers/aer/__init__.py
+++ b/qiskit/providers/aer/__init__.py
@@ -10,8 +10,8 @@
 from .aerprovider import AerProvider
 from .aerjob import AerJob
 from .backends import *
-from .noise import *
-from .utils import *
+from . import noise
+from . import utils
 from .version import __version__
 
 # Global instance to be used as the entry point for convenience.
diff --git a/qiskit/providers/aer/backends/__init__.py b/qiskit/providers/aer/backends/__init__.py
index a2895b43a2..e9ceb91fd1 100644
--- a/qiskit/providers/aer/backends/__init__.py
+++ b/qiskit/providers/aer/backends/__init__.py
@@ -10,4 +10,3 @@
 from .qasm_simulator import QasmSimulator
 from .statevector_simulator import StatevectorSimulator
 from .unitary_simulator import UnitarySimulator
-
diff --git a/qiskit/providers/aer/backends/wrappers/__init__.py b/qiskit/providers/aer/backends/wrappers/__init__.py
deleted file mode 100644
index 313d30edff..0000000000
--- a/qiskit/providers/aer/backends/wrappers/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2018, IBM.
-#
-# This source code is licensed under the Apache License, Version 2.0 found in
-# the LICENSE.txt file in the root directory of this source tree.
-
-"""Aer Wrappers"""
diff --git a/qiskit/providers/aer/utils/__init__.py b/qiskit/providers/aer/utils/__init__.py
index a4cfc57ed1..e97492ac80 100644
--- a/qiskit/providers/aer/utils/__init__.py
+++ b/qiskit/providers/aer/utils/__init__.py
@@ -6,3 +6,5 @@
 # the LICENSE.txt file in the root directory of this source tree.
 
 """Utilities"""
+
+from . import qobj_utils
diff --git a/test/terra/utils/ref_measure.py b/test/terra/utils/ref_measure.py
index 1efa7f3fbf..fd59cda795 100644
--- a/test/terra/utils/ref_measure.py
+++ b/test/terra/utils/ref_measure.py
@@ -17,9 +17,9 @@
 # direclty by qobj instructions until terra compiler supports them
 from qiskit import compile
 from qiskit.providers.aer.backends import QasmSimulator
-from qiskit.providers.aer.utils.qobj_utils import insert_item
-from qiskit.providers.aer.utils.qobj_utils import measure_item
-from qiskit.providers.aer.utils.qobj_utils import iden_item
+from qiskit.providers.aer.utils.qobj_utils import insert_instr
+from qiskit.providers.aer.utils.qobj_utils import measure_instr
+from qiskit.providers.aer.utils.qobj_utils import iden_instr
 
 
 # ==========================================================================