Revert "Add missing _ imports to allow doc generation"

This change reverts commit 0453785f3f7b2a578b433cb0544394aac9bcfb95 and
fixes a bug where the _() was not being recognized when building the
documentation while preserving the delayed translation of error
messages.

Closes-Bug: #1211507
Related-Bug: #1209413

Change-Id: I5d52941e1f08ec656f7279efb6cdf496d81861da

diff --git a/heat/__init__.py b/heat/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..57e2d0f65d43ff72cb58971553ed2fa95d0e8ee7 100644 (file)
--- a/heat/__init__.py
+++ b/heat/__init__.py
@@ -0,0 +1,21 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    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 heat.openstack.common import gettextutils
+
+
+gettextutils.install('heat')

diff --git a/heat/common/config.py b/heat/common/config.py
index 87533868cff33cad210d35e8576f591c38e28f97..8feeacb30d1e6a2be0a6b74285a5307f696545e9 100644 (file)
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -26,7 +26,6 @@ from oslo.config import cfg
 
 from heat.common import wsgi
 
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.openstack.common import rpc
 

diff --git a/heat/common/exception.py b/heat/common/exception.py
index f0006d542f83c0da0d0025843a14fe9cefdace90..3492c3ac1d80e0a6454e7bd6782401af03629fdd 100644 (file)
--- a/heat/common/exception.py
+++ b/heat/common/exception.py
@@ -21,7 +21,6 @@ import functools
 import urlparse
 import sys
 from heat.openstack.common import exception
-from heat.openstack.common.gettextutils import _
 
 
 OpenstackException = exception.OpenstackException

diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 717455f9897b9e97a070003ef612cb5198332ebd..b2e142e571a9a3a7efcde9e34a99f9395e15805b 100644 (file)
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -45,7 +45,6 @@ import webob.exc
 
 from heat.common import exception
 from heat.openstack.common import gettextutils
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import importutils