Graduate to oslo.i18n and cleanup incubator usage

Graduate from Oslo Incubator to oslo.i18n library.
Cleanup of unused Oslo Incubator utils.
Added optional enable_lazy() usage.

Change-Id: I5ec02477f3f52f4d7097669120581e82cced3748
Signed-off-by: Chuck Short <chuck.short@canonical.com>

8 files changed, 12 insertions, 12 deletions

diff --git a/heatclient/common/deployment_utils.py b/heatclient/common/deployment_utils.py
index ee209dc..c44da2f 100644
--- a/heatclient/common/deployment_utils.py
+++ b/heatclient/common/deployment_utils.py
@@ -18,8 +18,8 @@ from six.moves.urllib import parse as urlparse
 from swiftclient import client as sc
 from swiftclient import utils as swiftclient_utils
 
+from heatclient._i18n import _
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
 from heatclient.v1 import software_configs
 
 
diff --git a/heatclient/common/environment_format.py b/heatclient/common/environment_format.py
index 8f2c4ea..201ff60 100644
--- a/heatclient/common/environment_format.py
+++ b/heatclient/common/environment_format.py
@@ -12,8 +12,8 @@
 
 import yaml
 
+from heatclient._i18n import _
 from heatclient.common import template_format
-from heatclient.openstack.common._i18n import _
 
 
 SECTIONS = (
diff --git a/heatclient/common/event_utils.py b/heatclient/common/event_utils.py
index c0bc42e..9208d0c 100644
--- a/heatclient/common/event_utils.py
+++ b/heatclient/common/event_utils.py
@@ -15,9 +15,9 @@
 import sys
 import time
 
+from heatclient._i18n import _
 from heatclient.common import utils
 import heatclient.exc as exc
-from heatclient.openstack.common._i18n import _
 
 
 def get_hook_events(hc, stack_id, event_args, nested_depth=0,
diff --git a/heatclient/common/hook_utils.py b/heatclient/common/hook_utils.py
index 39fedb5..66b980a 100644
--- a/heatclient/common/hook_utils.py
+++ b/heatclient/common/hook_utils.py
@@ -14,9 +14,9 @@ import logging
 
 from oslo_utils import fnmatch
 
-import heatclient.exc as exc
-from heatclient.openstack.common._i18n import _
-from heatclient.openstack.common._i18n import _LE
+from heatclient._i18n import _
+from heatclient._i18n import _LE
+from heatclient import exc
 
 logger = logging.getLogger(__name__)
 
diff --git a/heatclient/common/http.py b/heatclient/common/http.py
index 3d05b91..0a31496 100644
--- a/heatclient/common/http.py
+++ b/heatclient/common/http.py
@@ -27,10 +27,10 @@ import requests
 import six
 from six.moves.urllib import parse
 
+from heatclient._i18n import _
+from heatclient._i18n import _LW
 from heatclient.common import utils
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
-from heatclient.openstack.common._i18n import _LW
 
 LOG = logging.getLogger(__name__)
 USER_AGENT = 'python-heatclient'
diff --git a/heatclient/common/template_format.py b/heatclient/common/template_format.py
index 9ba4d64..f73339f 100644
--- a/heatclient/common/template_format.py
+++ b/heatclient/common/template_format.py
@@ -13,7 +13,7 @@
 import json
 import yaml
 
-from heatclient.openstack.common._i18n import _
+from heatclient._i18n import _
 
 if hasattr(yaml, 'CSafeLoader'):
     yaml_loader = yaml.CSafeLoader
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py
index cf28aef..c81da43 100644
--- a/heatclient/common/template_utils.py
+++ b/heatclient/common/template_utils.py
@@ -20,11 +20,11 @@ from six.moves.urllib import error
 from six.moves.urllib import parse
 from six.moves.urllib import request
 
+from heatclient._i18n import _
 from heatclient.common import environment_format
 from heatclient.common import template_format
 from heatclient.common import utils
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
 
 
 def process_template_path(template_path, object_request=None, existing=False):
diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py
index f2b20f1..91410ac 100644
--- a/heatclient/common/utils.py
+++ b/heatclient/common/utils.py
@@ -29,9 +29,9 @@ from six.moves.urllib import parse
 from six.moves.urllib import request
 import yaml
 
+from heatclient._i18n import _
+from heatclient._i18n import _LE
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
-from heatclient.openstack.common._i18n import _LE
 from heatclient.openstack.common import cliutils
 
 LOG = logging.getLogger(__name__)