openstack/keystonemiddleware
Code Issues Proposed changes

Stop using function deprecated in py34

Browse Source 
Python 3.4 has deprecated some functions:

LOG.warn:
 DeprecationWarning: The 'warn' method is deprecated, use 'warning'
 instead

SafeConfigParser:
 DeprecationWarning: The SafeConfigParser class has been renamed to
 ConfigParser in Python 3.2. This alias will be removed in future
 versions. Use ConfigParser directly instead.

ConfigParser's readfp:
 DeprecationWarning: This method will be removed in future versions.
 Use 'parser.read_file()' instead.

Change-Id: I82829e05682931128eb6fcaf0c5e215671d1173d
This commit is contained in:
Brant Knudson 2015-06-03 20:33:49 -05:00
parent 57d389da8a
commit c94f403490
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keystonemiddleware/audit.py
View File

@ -46,6 +46,7 @@ from pycadf import reporterstep
from pycadf import resource
from pycadf import tag
from pycadf import timestamp
import six
from six.moves import configparser
from six.moves.urllib import parse as urlparse
import webob.dec
@ -79,6 +80,16 @@ AuditMap = collections.namedtuple('AuditMap',
'default_target_endpoint_type'])
# NOTE(blk-u): Compatibility for Python 2. SafeConfigParser and
# SafeConfigParser.readfp are deprecated in Python 3. Remove this when we drop
# support for Python 2.
if six.PY2:
class ConfigParser(configparser.SafeConfigParser):
read_file = configparser.SafeConfigParser.readfp
else:
ConfigParser = configparser.ConfigParser
class OpenStackAuditApi(object):
def __init__(self, cfg_file):
@ -90,8 +101,8 @@ class OpenStackAuditApi(object):
if cfg_file:
try:
map_conf = configparser.SafeConfigParser()
map_conf.readfp(open(cfg_file))
map_conf = ConfigParser()
map_conf.read_file(open(cfg_file))
try:
default_target_endpoint_type = map_conf.get(

12
keystonemiddleware/auth_token/__init__.py
View File

@ -735,11 +735,11 @@ class AuthProtocol(object):
verified = self._verify_signed_token(token,
token_hashes)
except exceptions.CertificateConfigError:
self._LOG.warn(_LW('Fetch certificate config failed, '
'fallback to online validation.'))
self._LOG.warning(_LW('Fetch certificate config failed, '
'fallback to online validation.'))
except exc.RevocationListError:
self._LOG.warn(_LW('Fetch revocation list failed, '
'fallback to online validation.'))
self._LOG.warning(_LW('Fetch revocation list failed, '
'fallback to online validation.'))
if verified is not None:
data = jsonutils.loads(verified)
@ -764,7 +764,7 @@ class AuthProtocol(object):
return auth_ref, data
except (exceptions.ConnectionRefused, exceptions.RequestTimeout):
self._LOG.debug('Token validation failure.', exc_info=True)
self._LOG.warn(_LW('Authorization failed for token'))
self._LOG.warning(_LW('Authorization failed for token'))
raise exc.InvalidToken(_('Token authorization failed'))
except exc.ServiceError:
raise
@ -772,7 +772,7 @@ class AuthProtocol(object):
self._LOG.debug('Token validation failure.', exc_info=True)
if token_hashes:
self._token_cache.store_invalid(token_hashes[0])
self._LOG.warn(_LW('Authorization failed for token'))
self._LOG.warning(_LW('Authorization failed for token'))
raise exc.InvalidToken(_('Token authorization failed'))
def _build_user_headers(self, auth_ref):