Merge "add missing gettextutils imports"

heat/api/middleware/version_negotiation.py

@@ -22,6 +22,7 @@ return
 import re
 
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 from heat.common import wsgi
 

heat/api/openstack/v1/stacks.py

@@ -30,6 +30,7 @@ from heat.common import urlfetch
 
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)
 

heat/api/openstack/v1/util.py

@@ -18,6 +18,8 @@ from functools import wraps
 
 from heat.common import identifier
 
+from heat.openstack.common.gettextutils import _
+
 
 def tenant_local(handler):
     '''

heat/common/auth.py

@@ -34,6 +34,8 @@ import urlparse
 
 from heat.common import exception
 
+from heat.openstack.common.gettextutils import _
+
 
 class BaseStrategy(object):
     def __init__(self):
@@ -117,7 +119,7 @@ class KeystoneStrategy(BaseStrategy):
 
         self.check_auth_params()
         auth_url = self.creds['auth_url']
-        for _ in range(self.MAX_REDIRECTS):
+        for x in range(self.MAX_REDIRECTS):
             try:
                 _authenticate(auth_url)
             except exception.AuthorizationRedirect as e:

heat/common/client.py

@@ -35,6 +35,8 @@ from heat.common import auth
 from heat.common import exception
 from heat.common import utils
 
+from heat.openstack.common.gettextutils import _
+
 
 # common chunk size for get and put
 CHUNKSIZE = 65536

heat/common/plugin_loader.py

@@ -27,6 +27,7 @@ import sys
 import types
 
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)
 

heat/common/policy.py

@@ -24,8 +24,10 @@ import os.path
 from oslo.config import cfg
 
 from heat.common import exception
+
 import heat.openstack.common.log as logging
 from heat.openstack.common import policy
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)
 

heat/common/urlfetch.py

@@ -21,6 +21,7 @@ import urllib2
 import urlparse
 
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)
 

heat/common/wsgi.py

@@ -44,6 +44,7 @@ import webob.exc
 
 from heat.common import exception
 from heat.openstack.common import importutils
+from heat.openstack.common.gettextutils import _
 
 
 URL_LENGTH_LIMIT = 50000

heat/db/sqlalchemy/migration.py

@@ -24,6 +24,7 @@ import migrate
 from migrate.versioning import util as migrate_util
 
 from heat.openstack.common import exception
+from heat.openstack.common.gettextutils import _
 
 _REPOSITORY = None
 

heat/engine/dependencies.py

@@ -18,6 +18,8 @@ import itertools
 
 from heat.common import exception
 
+from heat.openstack.common.gettextutils import _
+
 
 class CircularDependencyException(exception.OpenstackException):
     message = _("Circular Dependency Found: %(cycle)s")

heat/engine/parser.py

@@ -32,6 +32,8 @@ from heat.engine.clients import Clients
 from heat.db import api as db_api
 
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
+
 from heat.common.exception import ServerError
 from heat.common.exception import StackValidationFailed
 

heat/engine/resource.py

@@ -28,6 +28,7 @@ from heat.engine.attributes import Attributes
 from heat.engine.properties import Properties
 
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)
 

heat/engine/resources/__init__.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 
 logger = logging.getLogger(__name__)

heat/engine/scheduler.py

@@ -22,6 +22,7 @@ from time import time as wallclock
 
 from heat.openstack.common import excutils
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger(__name__)