openstack
/
oslo.context
Code Issues Proposed changes

Merge "Revert "Postpone deprecation warnings to Pike""

This commit is contained in:
Jenkins 2017-09-20 13:25:42 +00:00 committed by Gerrit Code Review
parent 15a6c74bf5 7a91ceed4e
commit ba3307845b
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oslo_context/context.py
View File

@ -34,6 +34,7 @@ import warnings
import debtcollector import debtcollector
_request_store = threading.local() _request_store = threading.local()
# These arguments will be passed to a new context from the first available # These arguments will be passed to a new context from the first available
@ -130,22 +131,16 @@ class _DeprecatedPolicyValues(collections.MutableMapping):
return d return d
# FIXME(dims): Skip deprecation warnings until Pike (Version 2.14)
_log_deprecation_warnings = False
def _moved_msg(new_name, old_name): def _moved_msg(new_name, old_name):
if old_name: if old_name:
deprecated_msg = "Property '%(old_name)s' has moved to '%(new_name)s'" deprecated_msg = "Property '%(old_name)s' has moved to '%(new_name)s'"
deprecated_msg = deprecated_msg % {'old_name': old_name, deprecated_msg = deprecated_msg % {'old_name': old_name,
'new_name': new_name} 'new_name': new_name}
# FIXME(dims): Skip deprecation warnings until Pike (Version 2.14) debtcollector.deprecate(deprecated_msg,
if _log_deprecation_warnings: version='2.6',
debtcollector.deprecate(deprecated_msg, removal_version='3.0',
version='2.6', stacklevel=5)
removal_version='3.0',
stacklevel=5)
def _moved_property(new_name, old_name=None, target=None): def _moved_property(new_name, old_name=None, target=None):

15
oslo_context/tests/test_context.py
View File

@ -613,17 +613,12 @@ class ContextTest(test_base.BaseTestCase):
self.assertEqual(0, len(self.warnings)) self.assertEqual(0, len(self.warnings))
self.assertEqual(user, ctx.user) self.assertEqual(user, ctx.user)
if context._log_deprecation_warnings: self.assertEqual(1, len(self.warnings))
self.assertEqual(1, len(self.warnings))
self.assertEqual(tenant, ctx.tenant) self.assertEqual(tenant, ctx.tenant)
if context._log_deprecation_warnings: self.assertEqual(2, len(self.warnings))
self.assertEqual(2, len(self.warnings))
self.assertEqual(domain, ctx.domain) self.assertEqual(domain, ctx.domain)
if context._log_deprecation_warnings: self.assertEqual(3, len(self.warnings))
self.assertEqual(3, len(self.warnings))
self.assertEqual(user_domain, ctx.user_domain) self.assertEqual(user_domain, ctx.user_domain)
if context._log_deprecation_warnings: self.assertEqual(4, len(self.warnings))
self.assertEqual(4, len(self.warnings))
self.assertEqual(project_domain, ctx.project_domain) self.assertEqual(project_domain, ctx.project_domain)
if context._log_deprecation_warnings: self.assertEqual(5, len(self.warnings))
self.assertEqual(5, len(self.warnings))