Merge "Remove unnecessary declaration of CONF"
This commit is contained in:
commit
409c94d616
@ -15,10 +15,8 @@
|
||||
import functools
|
||||
import os
|
||||
|
||||
from keystone.common import config
|
||||
from keystone.openstack.common import log
|
||||
|
||||
CONF = config.CONF
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -16,12 +16,10 @@ from oslo.utils import timeutils
|
||||
import webob.dec
|
||||
|
||||
from keystone.common import wsgi
|
||||
from keystone import config
|
||||
from keystone.openstack.common import log
|
||||
from keystone.openstack.common import versionutils
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
LOG = log.getLogger('access')
|
||||
APACHE_TIME_FORMAT = '%d/%b/%Y:%H:%M:%S'
|
||||
APACHE_LOG_FORMAT = (
|
||||
|
@ -13,9 +13,6 @@
|
||||
# under the License.
|
||||
|
||||
from keystone.common import extension
|
||||
from keystone import config
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
EXTENSION_DATA = {
|
||||
|
@ -15,13 +15,11 @@
|
||||
|
||||
from keystone.common import dependency
|
||||
from keystone.common import manager
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -17,13 +17,9 @@ from keystone.common import authorization
|
||||
from keystone.common import controller
|
||||
from keystone.common import dependency
|
||||
from keystone.common import wsgi
|
||||
from keystone import config
|
||||
from keystone.contrib.federation import utils
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class _ControllerBase(controller.V3Controller):
|
||||
"""Base behaviors for federation controllers."""
|
||||
|
||||
|
@ -12,15 +12,11 @@
|
||||
|
||||
import uuid
|
||||
|
||||
from keystone.common import config
|
||||
from keystone.common import sql
|
||||
from keystone.contrib import revoke
|
||||
from keystone.contrib.revoke import model
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class RevocationEvent(sql.ModelBase, sql.ModelDictMixin):
|
||||
__tablename__ = 'revocation_event'
|
||||
attributes = model.REVOKE_KEYS
|
||||
|
@ -28,12 +28,9 @@ import hmac
|
||||
from keystone.common import extension
|
||||
from keystone.common import utils
|
||||
from keystone.common import wsgi
|
||||
from keystone import config
|
||||
from keystone.contrib.ec2 import controllers
|
||||
from keystone import exception
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
EXTENSION_DATA = {
|
||||
'name': 'OpenStack S3 API',
|
||||
'namespace': 'http://docs.openstack.org/identity/api/ext/'
|
||||
|
@ -14,13 +14,11 @@
|
||||
|
||||
from keystone.common import extension
|
||||
from keystone.common import wsgi
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = config.CONF
|
||||
|
||||
MEDIA_TYPE_JSON = 'application/vnd.openstack.identity-%s+json'
|
||||
MEDIA_TYPE_XML = 'application/vnd.openstack.identity-%s+xml'
|
||||
|
@ -13,11 +13,8 @@
|
||||
# under the License.
|
||||
|
||||
from keystone.common import sql
|
||||
from keystone import config
|
||||
from keystone.tests import test_backend_sql
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class SqlFederation(test_backend_sql.SqlModels):
|
||||
"""Set of tests for checking SQL Federation."""
|
||||
|
@ -17,15 +17,11 @@ import uuid
|
||||
import six
|
||||
|
||||
from keystone.common import wsgi
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class ExceptionTestCase(tests.TestCase):
|
||||
def assertValidJsonRendering(self, e):
|
||||
resp = wsgi.render_exception(e)
|
||||
|
@ -17,14 +17,10 @@ import uuid
|
||||
|
||||
from keystoneclient.contrib.ec2 import utils as ec2_utils
|
||||
|
||||
from keystone import config
|
||||
from keystone import tests
|
||||
from keystone.tests import test_keystoneclient
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
|
||||
def config_files(self):
|
||||
config_files = super(KcMasterSqlTestCase, self).config_files()
|
||||
|
@ -21,16 +21,12 @@ import six
|
||||
from six.moves.urllib import request as urlrequest
|
||||
from testtools import matchers
|
||||
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import policy as common_policy
|
||||
from keystone.policy.backends import rules
|
||||
from keystone import tests
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class PolicyFileTestCase(tests.TestCase):
|
||||
def setUp(self):
|
||||
# self.tmpfilename should exist before setUp super is called
|
||||
|
@ -19,16 +19,12 @@ from oslo.utils import timeutils
|
||||
from testtools import matchers
|
||||
|
||||
from keystone.common import dependency
|
||||
from keystone import config
|
||||
from keystone.contrib.revoke import model
|
||||
from keystone import exception
|
||||
from keystone import tests
|
||||
from keystone.tests import test_backend_sql
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
def _new_id():
|
||||
return uuid.uuid4().hex
|
||||
|
||||
|
@ -12,15 +12,11 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from keystone import config
|
||||
from keystone import tests
|
||||
from keystone.tests import test_sql_migrate_extensions
|
||||
from keystone.tests import test_sql_upgrade
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class PostgresqlMigrateTests(test_sql_upgrade.SqlUpgradeTests):
|
||||
def setUp(self):
|
||||
self.skip_if_env_not_set('ENABLE_LIVE_POSTGRES_TEST')
|
||||
|
@ -20,14 +20,12 @@ import six
|
||||
from keystone import assignment
|
||||
from keystone.common import controller
|
||||
from keystone.common import dependency
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
def _trustor_trustee_only(trust, user_id):
|
||||
|
Loading…
Reference in New Issue
Block a user