Remove "# noqa" leftovers for gettextutils._

Change-Id: I43ab6acf982538377639a7cc13b9dfbc80c78a15

ceilometer/agent.py

@@ -25,7 +25,7 @@ import urlparse
 from stevedore import extension
 
 from ceilometer.openstack.common import context
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import service as os_service
 from ceilometer import pipeline

ceilometer/alarm/evaluator/__init__.py

@@ -26,7 +26,7 @@ from ceilometerclient import client as ceiloclient
 from oslo.config import cfg
 import six
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 

ceilometer/alarm/evaluator/combination.py

@@ -20,7 +20,7 @@
 import itertools
 
 from ceilometer.alarm import evaluator
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 LOG = log.getLogger(__name__)

ceilometer/alarm/evaluator/threshold.py

@@ -22,7 +22,7 @@ import operator
 
 from ceilometer.alarm import evaluator
 from ceilometer.alarm.evaluator import utils
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 

ceilometer/alarm/notifier/log.py

@@ -18,7 +18,7 @@
 """Log alarm notifier."""
 
 from ceilometer.alarm import notifier
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 LOG = log.getLogger(__name__)

ceilometer/alarm/notifier/rest.py

@@ -24,7 +24,7 @@ import six.moves.urllib.parse as urlparse
 from oslo.config import cfg
 
 from ceilometer.alarm import notifier
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import jsonutils
 from ceilometer.openstack.common import log
 

ceilometer/alarm/partition/coordination.py

@@ -21,7 +21,7 @@ import random
 import uuid
 
 from ceilometer.alarm import rpc as rpc_alarm
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 

ceilometer/alarm/rpc.py

@@ -20,7 +20,7 @@ from oslo.config import cfg
 
 from ceilometer import messaging
 from ceilometer.openstack.common import context
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.storage import models
 

ceilometer/alarm/service.py

@@ -28,7 +28,7 @@ from stevedore import extension
 from ceilometer.alarm.partition import coordination
 from ceilometer.alarm import rpc as rpc_alarm
 from ceilometer import messaging
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 from ceilometer.openstack.common import service as os_service

ceilometer/api/controllers/v2.py

@@ -48,7 +48,7 @@ import wsmeext.pecan as wsme_pecan
 from ceilometer.api import acl
 from ceilometer import messaging
 from ceilometer.openstack.common import context
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import strutils
 from ceilometer.openstack.common import timeutils

ceilometer/api/middleware.py

@@ -29,7 +29,7 @@ import webob
 
 from ceilometer.api import hooks
 from ceilometer.openstack.common import gettextutils
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 LOG = log.getLogger(__name__)

ceilometer/api/v1/blueprint.py

@@ -89,7 +89,7 @@ import datetime
 
 import flask
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 

ceilometer/central/manager.py

@@ -20,7 +20,7 @@ from keystoneclient.v2_0 import client as ksclient
 from oslo.config import cfg
 
 from ceilometer import agent
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 cfg.CONF.import_group('service_credentials', 'ceilometer.service')

ceilometer/collector.py

@@ -22,7 +22,7 @@ import msgpack
 from oslo.config import cfg
 
 from ceilometer import messaging
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import service as os_service
 from ceilometer.openstack.common import units

ceilometer/compute/notifications/cpu.py

@@ -20,7 +20,7 @@ events.
 """
 
 from ceilometer.compute import notifications
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import sample

ceilometer/compute/nova_notifier.py

@@ -37,7 +37,7 @@ from nova import utils
 from stevedore import extension
 
 from ceilometer.compute.virt import inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 
 
 # This module runs inside the nova compute

ceilometer/compute/pollsters/cpu.py

@@ -21,7 +21,7 @@
 from ceilometer.compute import plugin
 from ceilometer.compute.pollsters import util
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import sample
 

ceilometer/compute/pollsters/disk.py

@@ -26,7 +26,7 @@ import six
 from ceilometer.compute import plugin
 from ceilometer.compute.pollsters import util
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import sample
 

ceilometer/compute/pollsters/memory.py

@@ -16,7 +16,7 @@
 from ceilometer.compute import plugin
 from ceilometer.compute.pollsters import util
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import sample
 

ceilometer/compute/pollsters/net.py

@@ -23,7 +23,7 @@ import copy
 from ceilometer.compute import plugin
 from ceilometer.compute.pollsters import util
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import sample

ceilometer/compute/virt/hyperv/utilsv2.py

@@ -28,7 +28,7 @@ if sys.platform == 'win32':
 from oslo.config import cfg
 
 from ceilometer.compute.virt import inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log as logging
 
 CONF = cfg.CONF

ceilometer/compute/virt/inspector.py

@@ -23,7 +23,7 @@ import collections
 from oslo.config import cfg
 from stevedore import driver
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 

ceilometer/compute/virt/libvirt/inspector.py

@@ -21,7 +21,7 @@ from lxml import etree
 from oslo.config import cfg
 
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log as logging
 
 libvirt = None

ceilometer/dispatcher/database.py

@@ -17,7 +17,7 @@
 # under the License.
 
 from ceilometer import dispatcher
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer.publisher import utils as publisher_utils

ceilometer/energy/kwapi.py

@@ -21,7 +21,7 @@ from oslo.config import cfg
 import requests
 
 from ceilometer.central import plugin
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import sample
 

ceilometer/event/converter.py

@@ -24,7 +24,7 @@ from oslo.config import cfg
 import six
 import yaml
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer.storage import models

ceilometer/event/endpoint.py

@@ -24,7 +24,7 @@ from stevedore import extension
 
 from ceilometer.event import converter as event_converter
 from ceilometer import messaging
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer import service
 from ceilometer.storage import models
 

ceilometer/hardware/plugin.py

@@ -26,7 +26,7 @@ import six
 
 from ceilometer.central import plugin
 from ceilometer.hardware import inspector as insloader
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 

ceilometer/network/floatingip.py

@@ -21,7 +21,7 @@
 
 from ceilometer.central import plugin
 from ceilometer import nova_client
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import sample

ceilometer/network/notifications.py

@@ -23,7 +23,7 @@
 from oslo.config import cfg
 import oslo.messaging
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import plugin
 from ceilometer import sample

ceilometer/network/statistics/opendaylight/client.py

@@ -20,7 +20,7 @@ import requests
 from requests import auth
 import six
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 

ceilometer/network/statistics/opendaylight/driver.py

@@ -19,7 +19,7 @@ from six.moves.urllib import parse as url_parse
 
 from ceilometer.network.statistics import driver
 from ceilometer.network.statistics.opendaylight import client
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import utils

ceilometer/notification.py

@@ -21,7 +21,7 @@ from stevedore import extension
 
 from ceilometer.event import endpoint as event_endpoint
 from ceilometer import messaging
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import service as os_service
 from ceilometer import pipeline

ceilometer/notifier.py

@@ -21,7 +21,7 @@ from ceilometer.openstack.common import log as logging
 from ceilometer import pipeline
 from ceilometer import transformer
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from stevedore import extension
 
 

ceilometer/objectstore/swift.py

@@ -25,7 +25,7 @@ from keystoneclient import exceptions
 from oslo.config import cfg
 from swiftclient import client as swift
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import plugin

ceilometer/pipeline.py

@@ -26,7 +26,7 @@ import os
 from oslo.config import cfg
 import yaml
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import publisher
 from ceilometer import transformer as xformer

ceilometer/plugin.py

@@ -27,7 +27,7 @@ import six
 
 from ceilometer import messaging
 from ceilometer.openstack.common import context
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 
 LOG = log.getLogger(__name__)

ceilometer/publisher/file.py

@@ -20,7 +20,7 @@ import logging
 import logging.handlers
 import six.moves.urllib.parse as urlparse
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import publisher
 

ceilometer/publisher/rpc.py

@@ -28,7 +28,7 @@ import oslo.messaging
 import oslo.messaging._drivers.common
 
 from ceilometer import messaging
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import publisher
 from ceilometer.publisher import utils

ceilometer/publisher/udp.py

@@ -24,7 +24,7 @@ import socket
 import msgpack
 from oslo.config import cfg
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 from ceilometer import publisher

ceilometer/service.py

@@ -26,7 +26,7 @@ from stevedore import named
 
 from ceilometer import messaging
 from ceilometer.openstack.common import gettextutils
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import utils
 

ceilometer/storage/__init__.py

@@ -24,7 +24,7 @@ from oslo.config import cfg
 import six
 from stevedore import driver
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer import utils
 

ceilometer/storage/impl_hbase.py

@@ -30,7 +30,7 @@ import six.moves.urllib.parse as urlparse
 import bson.json_util
 import happybase
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 from ceilometer.openstack.common import timeutils

ceilometer/storage/impl_log.py

@@ -18,7 +18,7 @@
 """Simple logging storage backend.
 """
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.storage import base
 

ceilometer/storage/impl_sqlalchemy.py

@@ -36,7 +36,7 @@ from sqlalchemy.orm import aliased
 from ceilometer.openstack.common.db import exception as dbexc
 from ceilometer.openstack.common.db.sqlalchemy import migration
 import ceilometer.openstack.common.db.sqlalchemy.session as sqlalchemy_session
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import storage

ceilometer/storage/pymongo_base.py

@@ -22,7 +22,7 @@
 import pymongo
 import weakref
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import network_utils
 from ceilometer.storage import base

ceilometer/tests/network/statistics/opendaylight/test_client.py

@@ -19,7 +19,7 @@ import six
 from six.moves.urllib import parse as url_parse
 
 from ceilometer.network.statistics.opendaylight import client
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import test
 
 

ceilometer/transformer/conversions.py

@@ -19,7 +19,7 @@
 import collections
 import re
 
-from ceilometer.openstack.common.gettextutils import _  # noqa
+from ceilometer.openstack.common.gettextutils import _
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
 from ceilometer import sample

tox.ini

@@ -47,3 +47,7 @@ ignore = None
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,tools,nova_tests,build
 show-source = True
+
+[hacking]
+import_exceptions =
+    ceilometer.openstack.common.gettextutils._