openstack/deb-keystone
Code Issues Proposed changes

Consistently use oslo_config.cfg.CONF

Browse Source 
Keystone modules used different sources of the CONF global so were
inconsistent. All modules should use CONF from oslo_config.cfg.

Change-Id: I60c8d2c577d37b9b8a367b46596154ce6c49fff4
This commit is contained in:
Brant Knudson
2015-01-14 20:19:35 -06:00
parent 08f584bec9
commit feb279d1dc
101 changed files with 221 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/contrib/oauth1/controllers.py
View File

@@ -14,13 +14,13 @@
"""Extensions supporting OAuth1."""
from oslo_config import cfg
from oslo_serialization import jsonutils
from oslo_utils import timeutils
from keystone.common import controller
from keystone.common import dependency
from keystone.common import wsgi
from keystone import config
from keystone.contrib.oauth1 import core as oauth1
from keystone.contrib.oauth1 import validator
from keystone import exception
@@ -29,7 +29,7 @@ from keystone.models import token_model
from keystone import notifications
CONF = config.CONF
CONF = cfg.CONF
@notifications.internal(notifications.INVALIDATE_USER_OAUTH_CONSUMER_TOKENS,

4
keystone/contrib/oauth1/core.py
View File

@@ -22,12 +22,12 @@ import uuid
import oauthlib.common
from oauthlib import oauth1
from oslo_config import cfg
import six
from keystone.common import dependency
from keystone.common import extension
from keystone.common import manager
from keystone import config
from keystone import exception
from keystone import notifications
@@ -57,7 +57,7 @@ class Token(object):
self.verifier = verifier
CONF = config.CONF
CONF = cfg.CONF
def token_generator(*args, **kwargs):