File new-oslo.diff of Package python-neutronclient

Index: python-neutronclient-2.3.12/neutronclient/i18n.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/i18n.py
+++ python-neutronclient-2.3.12/neutronclient/i18n.py
@@ -9,9 +9,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo import i18n
+#from oslo import i18n
+import oslo_i18n as i18n
 
 _translators = i18n.TranslatorFactory(domain='neutronclient')
 
 # The primary translation function using the well-known name "_"
Index: python-neutronclient-2.3.12/neutronclient/common/utils.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/common/utils.py
+++ python-neutronclient-2.3.12/neutronclient/common/utils.py
@@ -20,10 +20,12 @@
 import argparse
 import logging
 import os
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+#from oslo.utils import encodeutils
+#from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import six
 
 from neutronclient.common import exceptions
 from neutronclient.i18n import _
Index: python-neutronclient-2.3.12/neutronclient/shell.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/shell.py
+++ python-neutronclient-2.3.12/neutronclient/shell.py
@@ -30,9 +30,10 @@ from keystoneclient.auth.identity import
 from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
 from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
 from keystoneclient import session
-from oslo.utils import encodeutils
+#from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 import six.moves.urllib.parse as urlparse
 
 from cliff import app
 from cliff import commandmanager
Index: python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/tests/unit/test_cli20.py
+++ python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20.py
@@ -19,9 +19,10 @@ import itertools
 import sys
 
 import fixtures
 from mox3 import mox
-from oslo.utils import encodeutils
+#from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 from oslotest import base
 import requests
 import six
 import six.moves.urllib.parse as urlparse