openstack/keystone
Code Issues Proposed changes

Remove references to keystone.openstack.common

Browse Source 
Use oslo_log in hacking checks instead of
the old log module from keystone.openstack.common

We don't have keystone.openstack.common anymore

Change-Id: I88ee4f37dbedee0ca06f1c636139d5a1a7bee7b7
This commit is contained in:
Davanum Srinivas 2015-08-20 17:10:39 -04:00
parent 07da6843a8
commit 1976e31628
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-generator/keystone.conf
View File

@ -3,7 +3,6 @@ output_file = etc/keystone.conf.sample
wrap_width = 79 wrap_width = 79
namespace = keystone namespace = keystone
namespace = keystone.notifications namespace = keystone.notifications
namespace = keystone.openstack.common.eventlet_backdoor
namespace = oslo.log namespace = oslo.log
namespace = oslo.messaging namespace = oslo.messaging
namespace = oslo.policy namespace = oslo.policy

2
keystone/common/controller.py
View File

@ -40,7 +40,7 @@ def v2_deprecated(f):
This is a placeholder for the pending deprecation of v2. The implementation This is a placeholder for the pending deprecation of v2. The implementation
of this decorator can be replaced with:: of this decorator can be replaced with::
from keystone.openstack.common import versionutils from oslo_log import versionutils
v2_deprecated = versionutils.deprecated( v2_deprecated = versionutils.deprecated(

2
keystone/common/environment/eventlet_server.py
View File

@ -178,7 +178,7 @@ class Server(service.ServiceBase):
The service interface is used by the launcher when receiving a The service interface is used by the launcher when receiving a
SIGHUP. The service interface is defined in SIGHUP. The service interface is defined in
keystone.openstack.common.service.Service. oslo_service.service.Service.
Keystone does not need to do anything here. Keystone does not need to do anything here.
""" """

2
keystone/tests/hacking/checks.py
View File

@ -144,7 +144,7 @@ class CheckForLoggingIssues(BaseASTChecker):
DEBUG_CHECK_DESC = 'K005 Using translated string in debug logging' DEBUG_CHECK_DESC = 'K005 Using translated string in debug logging'
NONDEBUG_CHECK_DESC = 'K006 Not using translating helper for logging' NONDEBUG_CHECK_DESC = 'K006 Not using translating helper for logging'
EXCESS_HELPER_CHECK_DESC = 'K007 Using hints when _ is necessary' EXCESS_HELPER_CHECK_DESC = 'K007 Using hints when _ is necessary'
LOG_MODULES = ('logging', 'keystone.openstack.common.log') LOG_MODULES = ('logging', 'oslo_log.log')
I18N_MODULES = ( I18N_MODULES = (
'keystone.i18n._', 'keystone.i18n._',
'keystone.i18n._LI', 'keystone.i18n._LI',

10
keystone/tests/unit/ksfixtures/hacking.py
View File

@ -118,8 +118,8 @@ class HackingCode(fixtures.Fixture):
import logging as stlib_logging import logging as stlib_logging
from keystone.i18n import _ from keystone.i18n import _
from keystone.i18n import _ as oslo_i18n from keystone.i18n import _ as oslo_i18n
from keystone.openstack.common import log from oslo_log import log
from keystone.openstack.common import log as oslo_logging from oslo_log import log as oslo_logging
# stdlib logging # stdlib logging
L0 = logging.getLogger() L0 = logging.getLogger()
@ -138,7 +138,7 @@ class HackingCode(fixtures.Fixture):
) )
# oslo logging and specifying a logger # oslo logging and specifying a logger
L2 = log.getLogger(__name__) L2 = logging.getLogger(__name__)
L2.debug(oslo_i18n('text')) L2.debug(oslo_i18n('text'))
# oslo logging w/ alias # oslo logging w/ alias
@ -207,8 +207,8 @@ class HackingLogging(fixtures.Fixture):
from keystone.i18n import _LE as error_hint from keystone.i18n import _LE as error_hint
from keystone.i18n import _LI from keystone.i18n import _LI
from keystone.i18n import _LW from keystone.i18n import _LW
from keystone.openstack.common import log from oslo_log import log
from keystone.openstack.common import log as oslo_logging from oslo_log import log as oslo_logging
""" """
examples = [ examples = [