openstack/ceilometer
Code Issues Proposed changes

Replace six with python3 code style

Browse Source 
Co-authored by: Matthias Runge <mrunge@redhat.com>

Change-Id: I85a4d79396874670f1b36cb91cfba5da812c2839
This commit is contained in:
kuangcx 2020-11-02 14:37:26 +08:00 committed by Matthias Runge
parent 71f3d092ac
commit c0632ae9e0
44 changed files with 88 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/compute/virt/hyperv/inspector.py
View File

@ -20,7 +20,6 @@ import sys
from os_win import exceptions as os_win_exc
from os_win import utilsfactory
from oslo_utils import units
import six
from ceilometer.compute.pollsters import util
from ceilometer.compute.virt import inspector as virt_inspector
@ -37,12 +36,8 @@ def convert_exceptions(exception_map, yields=True):
break
exc_info = sys.exc_info()
# NOTE(claudiub): Python 3 raises the exception object given as
# the second argument in six.reraise.
# The original message will be maintained by passing the
# original exception.
exc = raised_exception(six.text_type(exc_info[1]))
six.reraise(raised_exception, exc, exc_info[2])
exc = raised_exception(str(exc_info[1]))
raise exc.with_traceback(exc_info[2])
def decorator(function):
if yields:

3
ceilometer/compute/virt/libvirt/inspector.py
View File

@ -17,7 +17,6 @@
from lxml import etree
from oslo_log import log as logging
from oslo_utils import units
import six
try:
import libvirt
@ -60,7 +59,7 @@ class LibvirtInspector(virt_inspector.Inspector):
'ex': ex}
raise virt_inspector.InstanceNotFoundException(msg)
except Exception as ex:
raise virt_inspector.InspectorException(six.text_type(ex))
raise virt_inspector.InspectorException(str(ex))
def _get_domain_not_shut_off_or_raise(self, instance):
instance_name = util.instance_name(instance)

5
ceilometer/compute/virt/vmware/inspector.py
View File

@ -17,7 +17,6 @@
from oslo_config import cfg
from oslo_utils import units
import six
from ceilometer.compute.virt import inspector as virt_inspector
from ceilometer.compute.virt.vmware import vsphere_operations
@ -132,7 +131,7 @@ class VsphereInspector(virt_inspector.Inspector):
in vnic_id_to_stats_map.items()
if not k.startswith('vmnic')}
vnic_stats[net_counter] = vnic_id_to_stats_map
vnic_ids.update(six.iterkeys(vnic_id_to_stats_map))
vnic_ids.update(vnic_id_to_stats_map.keys())
# Stats provided from vSphere are in KB/s, converting it to B/s.
for vnic_id in sorted(vnic_ids):
@ -165,7 +164,7 @@ class VsphereInspector(virt_inspector.Inspector):
disk_id_to_stat_map = self._ops.query_vm_device_stats(
vm_mobj, disk_counter_id, duration)
disk_stats[disk_counter] = disk_id_to_stat_map
disk_ids.update(six.iterkeys(disk_id_to_stat_map))
disk_ids.update(disk_id_to_stat_map.keys())
for disk_id in disk_ids:

5
ceilometer/declarative.py
View File

@ -15,7 +15,6 @@ import os
from jsonpath_rw_ext import parser
from oslo_log import log
import six
import yaml
from ceilometer.i18n import _
@ -71,7 +70,7 @@ class Definition(object):
if 'plugin' in cfg:
plugin_cfg = cfg['plugin']
if isinstance(plugin_cfg, six.string_types):
if isinstance(plugin_cfg, str):
plugin_name = plugin_cfg
plugin_params = {}
else:
@ -107,7 +106,7 @@ class Definition(object):
else:
fields = '|'.join('(%s)' % path for path in fields)
if isinstance(fields, six.integer_types):
if isinstance(fields, int):
self.getter = fields
else:
try:

3
ceilometer/event/converter.py
View File

@ -18,7 +18,6 @@ from oslo_log import log
from oslo_utils import fnmatch
from oslo_utils import timeutils
import pkg_resources
import six
from ceilometer import declarative
from ceilometer.event import models
@ -97,7 +96,7 @@ class EventDefinition(object):
raise declarative.EventDefinitionException(
_("Required field %s not specified") % err.args[0], self.cfg)
if isinstance(event_type, six.string_types):
if isinstance(event_type, str):
event_type = [event_type]
for t in event_type:

9
ceilometer/event/models.py
View File

@ -13,7 +13,6 @@
"""Model classes for use in the events storage API.
"""
from oslo_utils import timeutils
import six
def serialize_dt(value):
@ -26,7 +25,7 @@ class Model(object):
def __init__(self, **kwds):
self.fields = list(kwds)
for k, v in six.iteritems(kwds):
for k, v in kwds.items():
setattr(self, k, v)
def as_dict(self):
@ -78,7 +77,7 @@ class Event(Model):
def __repr__(self):
trait_list = []
if self.traits:
trait_list = [six.text_type(trait) for trait in self.traits]
trait_list = [str(trait) for trait in self.traits]
return ("<Event: %s, %s, %s, %s>" %
(self.message_id, self.event_type, self.generated,
" ".join(trait_list)))
@ -146,6 +145,6 @@ class Trait(Model):
if trait_type is cls.DATETIME_TYPE:
return timeutils.normalize_time(timeutils.parse_isotime(value))
# Cropping the text value to match the TraitText value size
if isinstance(value, six.binary_type):
if isinstance(value, bytes):
return value.decode('utf-8')[:255]
return six.text_type(value)[:255]
return str(value)[:255]

6
ceilometer/event/trait_plugins.py
View File

@ -17,13 +17,11 @@ import abc
from oslo_log import log
from oslo_utils import timeutils
import six
LOG = log.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta)
class TraitPluginBase(object):
class TraitPluginBase(object, metaclass=abc.ABCMeta):
"""Base class for plugins.
It converts notification fields to Trait values.
@ -132,7 +130,7 @@ class SplitterTraitPlugin(TraitPluginBase):
for match in match_list]
def _trait_value(self, match):
value = six.text_type(match[1])
value = str(match[1])
if self.max_split is not None:
values = value.split(self.separator, self.max_split)
else:

5
ceilometer/hardware/inspector/base.py
View File

@ -16,11 +16,8 @@
import abc
import six
@six.add_metaclass(abc.ABCMeta)
class Inspector(object):
class Inspector(object, metaclass=abc.ABCMeta):
@abc.abstractmethod
def inspect_generic(self, host, cache, extra_metadata, param):
"""A generic inspect function.

7
ceilometer/hardware/inspector/snmp.py
View File

@ -20,7 +20,6 @@ import copy
from oslo_log import log
from pysnmp.entity.rfc3413.oneliner import cmdgen
from pysnmp.proto import rfc1905
import six
from urllib import parse as urlparse
@ -207,7 +206,7 @@ class SNMPInspector(base.Inspector):
@classmethod
def construct_metadata(cls, oid_cache, meta_defs, suffix='', host=None):
metadata = {}
for key, oid_def in six.iteritems(meta_defs):
for key, oid_def in meta_defs.items():
metadata[key] = cls.get_oid_value(oid_cache, oid_def, suffix, host)
return metadata
@ -291,7 +290,7 @@ class SNMPInspector(base.Inspector):
# populate the oid into cache
self._query_oids(host, [_interface_ip_oid], cache, True)
ip_addr = ''
for k, v in six.iteritems(oid_cache):
for k, v in oid_cache.items():
if k.startswith(_interface_ip_oid) and v == int(suffix[1:]):
ip_addr = k.replace(_interface_ip_oid + ".", "")
metadata.update(ip=ip_addr)
@ -342,6 +341,6 @@ class SNMPInspector(base.Inspector):
processed['metric_oid'] = (param['oid'], eval(param['type']))
processed['post_op'] = param.get('post_op', None)
processed['metadata'] = {}
for k, v in six.iteritems(param.get('metadata', {})):
for k, v in param.get('metadata', {}).items():
processed['metadata'][k] = (v['oid'], eval(v['type']))
return processed

3
ceilometer/hardware/pollsters/generic.py
View File

@ -19,7 +19,6 @@ import pkg_resources
from oslo_config import cfg
from oslo_log import log
from oslo_utils import netutils
import six
from ceilometer import declarative
from ceilometer.hardware import inspector as insloader
@ -44,7 +43,7 @@ class MeterDefinition(object):
def __init__(self, definition_cfg):
self.cfg = definition_cfg
for fname, fval in self.cfg.items():
if (isinstance(fname, six.string_types) and
if (isinstance(fname, str) and
(fname in self.required_fields or
fname.endswith('_inspector'))):
setattr(self, fname, fval)

2
ceilometer/ipmi/platform/intel_node_manager.py
View File

@ -28,7 +28,6 @@ import threading
import time
from oslo_config import cfg
import six
from ceilometer.i18n import _
from ceilometer.ipmi.platform import exception as nmexcept
@ -178,7 +177,6 @@ class NodeManager(object):
with open(file_path, 'rb') as bin_fp:
data_str = binascii.hexlify(bin_fp.read())
if six.PY3:
data_str = data_str.decode('ascii')
oem_id_index = data_str.find(prefix)
if oem_id_index != -1:

4
ceilometer/ipmi/pollsters/node.py
View File

@ -15,7 +15,6 @@
import abc
from oslo_log import log
import six
from ceilometer.i18n import _
from ceilometer.ipmi.platform import exception as nmexcept
@ -26,8 +25,7 @@ from ceilometer import sample
LOG = log.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta)
class _Base(plugin_base.PollsterBase):
class _Base(plugin_base.PollsterBase, metaclass=abc.ABCMeta):
def setup_environment(self):
super(_Base, self).setup_environment()

8
ceilometer/meter/notifications.py
View File

@ -15,8 +15,6 @@ import itertools
import os
import re
import six
from oslo_config import cfg
from oslo_log import log
from stevedore import extension
@ -60,7 +58,7 @@ class MeterDefinition(object):
_("Required fields %s not specified") % missing, self.cfg)
self._event_type = self.cfg.get('event_type')
if isinstance(self._event_type, six.string_types):
if isinstance(self._event_type, str):
self._event_type = [self._event_type]
self._event_type = [re.compile(etype) for etype in self._event_type]
@ -93,7 +91,7 @@ class MeterDefinition(object):
# List of fields we expected when multiple meter are in the payload
self.lookup = self.cfg.get('lookup')
if isinstance(self.lookup, six.string_types):
if isinstance(self.lookup, str):
self.lookup = [self.lookup]
def match_type(self, meter_name):
@ -204,7 +202,7 @@ class ProcessMeterNotifications(endpoint.SampleEndpoint):
md = MeterDefinition(meter_cfg, self.conf, plugin_manager)
except declarative.DefinitionException as e:
errmsg = "Error loading meter definition: %s"
LOG.error(errmsg, six.text_type(e))
LOG.error(errmsg, str(e))
else:
definitions[meter_cfg['name']] = md
return definitions.values()

4
ceilometer/network/services/lbaas.py
View File

@ -17,7 +17,6 @@ import abc
import collections
from oslo_log import log
import six
from ceilometer.i18n import _
from ceilometer.network.services import base
@ -217,8 +216,7 @@ class LBHealthMonitorPollster(base.BaseServicesPollster):
)
@six.add_metaclass(abc.ABCMeta)
class _LBStatsPollster(base.BaseServicesPollster):
class _LBStatsPollster(base.BaseServicesPollster, metaclass=abc.ABCMeta):
"""Base Statistics pollster.
It is capturing the statistics info and yielding samples for connections

4
ceilometer/network/statistics/__init__.py
View File

@ -16,7 +16,6 @@
import abc
from oslo_utils import netutils
import six
from stevedore import driver as _driver
from urllib import parse as urlparse
@ -24,8 +23,7 @@ from ceilometer.polling import plugin_base
from ceilometer import sample
@six.add_metaclass(abc.ABCMeta)
class _Base(plugin_base.PollsterBase):
class _Base(plugin_base.PollsterBase, metaclass=abc.ABCMeta):
NAMESPACE = 'network.statistics.drivers'
drivers = {}

5
ceilometer/network/statistics/driver.py
View File

@ -15,11 +15,8 @@
import abc
import six
@six.add_metaclass(abc.ABCMeta)
class Driver(object):
class Driver(object, metaclass=abc.ABCMeta):
def __init__(self, conf):
self.conf = conf

7
ceilometer/network/statistics/opencontrail/client.py
View File

@ -16,7 +16,6 @@ import copy
from oslo_log import log
import requests
import six
from urllib import parse as urlparse
from ceilometer.i18n import _
@ -75,12 +74,12 @@ class AnalyticsAPIBaseClient(object):
curl_command = ['REQ: curl -i -X GET ']
params = []
for name, value in six.iteritems(req_params['data']):
for name, value in req_params['data'].items():
params.append("%s=%s" % (name, value))
curl_command.append('"%s?%s" ' % (url, '&'.join(params)))
for name, value in six.iteritems(req_params['headers']):
for name, value in req_params['headers'].items():
curl_command.append('-H "%s: %s" ' % (name, value))
LOG.debug(''.join(curl_command))
@ -93,7 +92,7 @@ class AnalyticsAPIBaseClient(object):
resp.status_code,
resp.reason)]
dump.extend('%s: %s\n' % (k, v)
for k, v in six.iteritems(resp.headers))
for k, v in resp.headers.items())
dump.append('\n')
if resp.content:
dump.extend([resp.content, '\n'])

9
ceilometer/network/statistics/opendaylight/client.py
View File

@ -14,11 +14,9 @@
# under the License.
import abc
from oslo_log import log
import requests
from requests import auth
import six
from ceilometer.i18n import _
@ -26,8 +24,7 @@ from ceilometer.i18n import _
LOG = log.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta)
class _Base(object):
class _Base(object, metaclass=abc.ABCMeta):
"""Base class of OpenDaylight REST APIs Clients."""
@abc.abstractproperty
@ -196,7 +193,7 @@ class Client(object):
curl_command.append('--user "%s":"***" ' % auth_class.username)
for name, value in six.iteritems(self._req_params['headers']):
for name, value in self._req_params['headers'].items():
curl_command.append('-H "%s: %s" ' % (name, value))
LOG.debug(''.join(curl_command))
@ -208,7 +205,7 @@ class Client(object):
resp.status_code,
resp.reason)]
dump.extend('%s: %s\n' % (k, v)
for k, v in six.iteritems(resp.headers))
for k, v in resp.headers.items())
dump.append('\n')
if resp.content:
dump.extend([resp.content, '\n'])

9
ceilometer/network/statistics/opendaylight/driver.py
View File

@ -14,7 +14,6 @@
# under the License.
from oslo_log import log
import six
from urllib import parse as urlparse
from ceilometer.network.statistics import driver
@ -27,7 +26,7 @@ LOG = log.getLogger(__name__)
def _get_properties(properties, prefix='properties'):
resource_meta = {}
if properties is not None:
for k, v in six.iteritems(properties):
for k, v in properties.items():
value = v['value']
key = prefix + '_' + k
if 'name' in v:
@ -139,7 +138,7 @@ class OpenDayLightDriver(driver.Driver):
container_data['user_links'] = user_links
for user_link_row in user_links_raw['userLinks']:
user_link = {}
for k, v in six.iteritems(user_link_row):
for k, v in user_link_row.items():
if (k == "dstNodeConnector" or
k == "srcNodeConnector"):
port_raw, node_raw = v.split('@')
@ -190,7 +189,7 @@ class OpenDayLightDriver(driver.Driver):
data = self._prepare_cache(endpoint, params, cache)
samples = []
for name, value in six.iteritems(data):
for name, value in data.items():
for sample in iter(extractor, value):
if sample is not None:
# set controller name and container name
@ -412,7 +411,7 @@ class OpenDayLightDriver(driver.Driver):
"""
val_iter, key_func = None, None
if isinstance(value, dict):
val_iter = six.iteritems(value)
val_iter = value.items()
key_func = lambda k: key_base + '.' + k if key_base else k # noqa
elif isinstance(value, (tuple, list)):
val_iter = enumerate(value)

4
ceilometer/pipeline/base.py
View File

@ -19,7 +19,6 @@ import abc
from oslo_config import cfg
from oslo_log import log
import oslo_messaging
import six
from ceilometer import agent
from ceilometer import publisher
@ -136,8 +135,7 @@ class Sink(object):
"""Flush data after all events have been injected to pipeline."""
@six.add_metaclass(abc.ABCMeta)
class Pipeline(object):
class Pipeline(object, metaclass=abc.ABCMeta):
"""Represents a coupling between a sink and a corresponding source."""
def __init__(self, conf, source, sink):

5
ceilometer/polling/manager.py
View File

@ -30,7 +30,6 @@ from oslo_config import cfg
from oslo_log import log
import oslo_messaging
from oslo_utils import timeutils
import six
from stevedore import extension
from tooz import coordination
from urllib import parse as urlparse
@ -101,7 +100,7 @@ class Resources(object):
not self.agent_manager.partition_coordinator or
self.agent_manager.hashrings[
static_resources_group].belongs_to_self(
six.text_type(v))] + source_discovery
str(v))] + source_discovery
return source_discovery
@ -550,7 +549,7 @@ class AgentManager(cotyledon.Service):
discovered = [
v for v in discovered if self.hashrings[
self.construct_group_id(discoverer.group_id)
].belongs_to_self(six.text_type(v))]
].belongs_to_self(str(v))]
resources.extend(discovered)
if discovery_cache is not None:

7
ceilometer/polling/plugin_base.py
View File

@ -17,7 +17,6 @@
import abc
import six
from stevedore import extension
@ -45,8 +44,7 @@ class PollsterPermanentError(Exception):
self.fail_res_list = resources
@six.add_metaclass(abc.ABCMeta)
class PollsterBase(object):
class PollsterBase(object, metaclass=abc.ABCMeta):
"""Base class for plugins that support the polling API."""
def setup_environment(self):
@ -124,8 +122,7 @@ class PollsterBase(object):
return extensions
@six.add_metaclass(abc.ABCMeta)
class DiscoveryBase(object):
class DiscoveryBase(object, metaclass=abc.ABCMeta):
KEYSTONE_REQUIRED_FOR_SERVICE = None
"""Service type required in keystone catalog to works"""

4
ceilometer/publisher/__init__.py
View File

@ -18,7 +18,6 @@ import abc
from oslo_log import log
from oslo_utils import netutils
import six
from stevedore import driver
@ -36,8 +35,7 @@ def get_publisher(conf, url, namespace):
return loaded_driver.driver(conf, parse_result)
@six.add_metaclass(abc.ABCMeta)
class ConfigPublisherBase(object):
class ConfigPublisherBase(object, metaclass=abc.ABCMeta):
"""Base class for plugins that publish data."""
def __init__(self, conf, parsed_url):

18
ceilometer/publisher/gnocchi.py
View File

@ -26,7 +26,6 @@ from keystoneauth1 import exceptions as ka_exceptions
from oslo_log import log
from oslo_utils import fnmatch
from oslo_utils import timeutils
import six
from stevedore import extension
from urllib import parse as urlparse
@ -43,8 +42,7 @@ LOG = log.getLogger(__name__)
def cache_key_mangler(key):
"""Construct an opaque cache key."""
if six.PY2:
key = key.encode('utf-8')
return uuid.uuid5(CACHE_NAMESPACE, key).hex
@ -53,10 +51,10 @@ EVENT_CREATE, EVENT_UPDATE, EVENT_DELETE = ("create", "update", "delete")
class ResourcesDefinition(object):
MANDATORY_FIELDS = {'resource_type': six.string_types,
MANDATORY_FIELDS = {'resource_type': str,
'metrics': (dict, list)}
MANDATORY_EVENT_FIELDS = {'id': six.string_types}
MANDATORY_EVENT_FIELDS = {'id': str}
def __init__(self, definition_cfg, archive_policy_default,
archive_policy_override, plugin_manager):
@ -373,9 +371,9 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
try:
self.batch_measures(measures, gnocchi_data)
except gnocchi_exc.ClientException as e:
LOG.error(six.text_type(e))
LOG.error(str(e))
except Exception as e:
LOG.error(six.text_type(e), exc_info=True)
LOG.error(str(e), exc_info=True)
for info in gnocchi_data.values():
resource = info["resource"]
@ -387,9 +385,9 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
self._if_not_cached(resource_type, resource['id'],
resource_extra)
except gnocchi_exc.ClientException as e:
LOG.error(six.text_type(e))
LOG.error(str(e))
except Exception as e:
LOG.error(six.text_type(e), exc_info=True)
LOG.error(str(e), exc_info=True)
@staticmethod
def _extract_resources_from_error(e, resource_infos):
@ -422,7 +420,7 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
pass
except gnocchi_exc.ClientException as e:
LOG.error('Error creating resource %(id)s: %(err)s',
{'id': resource['id'], 'err': six.text_type(e)})
{'id': resource['id'], 'err': str(e)})
# We cannot post measures for this resource
# and we can't patch it later
del measures[resource['id']]

4
ceilometer/publisher/messaging.py
View File

@ -25,7 +25,6 @@ from oslo_log import log
import oslo_messaging
from oslo_utils import encodeutils
from oslo_utils import excutils
import six
from urllib import parse as urlparse
from ceilometer.i18n import _
@ -70,8 +69,7 @@ def raise_delivery_failure(exc):
cause=exc)
@six.add_metaclass(abc.ABCMeta)
class MessagingPublisher(publisher.ConfigPublisherBase):
class MessagingPublisher(publisher.ConfigPublisherBase, metaclass=abc.ABCMeta):
def __init__(self, conf, parsed_url):
super(MessagingPublisher, self).__init__(conf, parsed_url)

3
ceilometer/publisher/monasca_data_filter.py
View File

@ -19,7 +19,6 @@ import datetime
from jsonpath_rw_ext import parser
from oslo_log import log
from oslo_utils import timeutils
import six
import yaml
from ceilometer import sample as sample_util
@ -135,7 +134,7 @@ class MonascaDataFilter(object):
if len(val_matches) > 0:
# resolve the find to the first match and get value
val = val_matches[0].value
if not isinstance(val, (str, six.text_type)) \
if not isinstance(val, (str, str)) \
and not isinstance(val, int):
# Don't support lists or dicts or ...
raise CeiloscaMappingDefinitionException(

18
ceilometer/publisher/utils.py
View File

@ -20,7 +20,6 @@ import hmac
from oslo_config import cfg
from oslo_utils import secretutils
import six
OPTS = [
@ -47,7 +46,7 @@ def decode_unicode(input):
# predictable insertion order to avoid inconsistencies in the
# message signature computation for equivalent payloads modulo
# ordering
for key, value in sorted(six.iteritems(input)):
for key, value in sorted(input.items()):
temp[decode_unicode(key)] = decode_unicode(value)
return temp
elif isinstance(input, (tuple, list)):
@ -55,9 +54,9 @@ def decode_unicode(input):
# the tuple would become list. So we have to generate the value as
# list here.
return [decode_unicode(element) for element in input]
elif isinstance(input, six.text_type):
elif isinstance(input, str):
return input.encode('utf-8')
elif six.PY3 and isinstance(input, six.binary_type):
elif isinstance(input, bytes):
return input.decode('utf-8')
else:
return input
@ -65,7 +64,7 @@ def decode_unicode(input):
def recursive_keypairs(d, separator=':'):
"""Generator that produces sequence of keypairs for nested dictionaries."""
for name, value in sorted(six.iteritems(d)):
for name, value in sorted(d.items()):
if isinstance(value, dict):
for subname, subvalue in recursive_keypairs(value, separator):
yield ('%s%s%s' % (name, separator, subname), subvalue)
@ -80,7 +79,7 @@ def compute_signature(message, secret):
if not secret:
return ''
if isinstance(secret, six.text_type):
if isinstance(secret, str):
secret = secret.encode('utf-8')
digest_maker = hmac.new(secret, b'', hashlib.sha256)
for name, value in recursive_keypairs(message):
@ -88,8 +87,8 @@ def compute_signature(message, secret):
# Skip any existing signature value, which would not have
# been part of the original message.
continue
digest_maker.update(six.text_type(name).encode('utf-8'))
digest_maker.update(six.text_type(value).encode('utf-8'))
digest_maker.update(str(name).encode('utf-8'))
digest_maker.update(str(value).encode('utf-8'))
return digest_maker.hexdigest()
@ -105,12 +104,11 @@ def verify_signature(message, secret):
old_sig = message.get('message_signature', '')
new_sig = compute_signature(message, secret)
if isinstance(old_sig, six.text_type):
if isinstance(old_sig, str):
try:
old_sig = old_sig.encode('ascii')
except UnicodeDecodeError:
return False
if six.PY3:
new_sig = new_sig.encode('ascii')
return secretutils.constant_time_compare(new_sig, old_sig)

5
ceilometer/sample.py
View File

@ -25,7 +25,6 @@ import uuid
from oslo_config import cfg
from oslo_utils import timeutils
import six
OPTS = [
cfg.StrOpt('sample_source',
@ -51,7 +50,7 @@ def add_reserved_user_metadata(conf, src_metadata, dest_metadata):
for prefix in conf.reserved_metadata_namespace:
md = dict(
(k[len(prefix):].replace('.', '_'),
v[:limit] if isinstance(v, six.string_types) else v)
v[:limit] if isinstance(v, str) else v)
for k, v in src_metadata.items()
if (k.startswith(prefix) and
k[len(prefix):].replace('.', '_') not in dest_metadata)
@ -61,7 +60,7 @@ def add_reserved_user_metadata(conf, src_metadata, dest_metadata):
for metadata_key in conf.reserved_metadata_keys:
md = dict(
(k.replace('.', '_'),
v[:limit] if isinstance(v, six.string_types) else v)
v[:limit] if isinstance(v, str) else v)
for k, v in src_metadata.items()
if (k == metadata_key and
k.replace('.', '_') not in dest_metadata)

3
ceilometer/tests/base.py
View File

@ -21,7 +21,6 @@ import fixtures
import oslo_messaging.conffixture
from oslo_utils import timeutils
from oslotest import base
import six
from testtools import testcase
import yaml
@ -96,7 +95,7 @@ def _skip_decorator(func):
try:
return func(*args, **kwargs)
except ceilometer.NotImplementedError as e:
raise testcase.TestSkipped(six.text_type(e))
raise testcase.TestSkipped(str(e))
return skip_if_not_implemented

3
ceilometer/tests/unit/compute/pollsters/test_location_metadata.py
View File

@ -17,7 +17,6 @@
"""
from oslotest import base
import six
from ceilometer.compute.pollsters import util
from ceilometer.polling import manager
@ -83,7 +82,7 @@ class TestLocationMetadata(base.BaseTestCase):
def test_metadata(self):
md = util._get_metadata_from_object(self.CONF, self.instance)
for prop, value in six.iteritems(self.INSTANCE_PROPERTIES):
for prop, value in self.INSTANCE_PROPERTIES.items():
if prop not in ("metadata"):
# Special cases
if prop == 'name':

3
ceilometer/tests/unit/event/test_converter.py
View File

@ -17,7 +17,6 @@ import datetime
from unittest import mock
import jsonpath_rw_ext
import six
from ceilometer import declarative
from ceilometer.event import converter
@ -65,7 +64,7 @@ class ConverterBase(base.BaseTestCase):
elif dtype == models.Trait.DATETIME_TYPE:
self.assertIsInstance(trait.value, datetime.datetime)
elif dtype == models.Trait.TEXT_TYPE:
self.assertIsInstance(trait.value, six.string_types)
self.assertIsInstance(trait.value, str)
def assertDoesNotHaveTrait(self, event, name):
traits = [trait for trait in event.traits if trait.name == name]

2
ceilometer/tests/unit/event/test_endpoint.py
View File

@ -18,7 +18,6 @@ from unittest import mock
import fixtures
import oslo_messaging
from oslo_utils import fileutils
import six
import yaml
from ceilometer.pipeline import event as event_pipe
@ -101,7 +100,6 @@ class TestEventEndpoint(tests_base.BaseTestCase):
}]
})
if six.PY3:
ev_pipeline = ev_pipeline.encode('utf-8')
ev_pipeline_cfg_file = fileutils.write_to_tempfile(
content=ev_pipeline, prefix="event_pipeline", suffix="yaml")

3
ceilometer/tests/unit/hardware/inspector/test_snmp.py
View File

@ -18,7 +18,6 @@ from unittest import mock
import fixtures
from oslo_utils import netutils
from pysnmp.proto import rfc1905
import six
from ceilometer.hardware.inspector import snmp
from ceilometer.tests import base as test_base
@ -45,7 +44,7 @@ class FakeCommandGenerator(object):
for oid in oids
if oid not in emptyOIDs
]
for emptyOID, exc in six.iteritems(emptyOIDs):
for emptyOID, exc in emptyOIDs.items():
if emptyOID in oids:
varBinds += [(FakeObjectName(emptyOID), exc)]
return (None, None, 0, varBinds)

2
ceilometer/tests/unit/hardware/pollsters/test_generic.py
View File

@ -17,7 +17,6 @@ from unittest import mock
import fixtures
from oslo_utils import fileutils
import six
import yaml
from ceilometer import declarative
@ -128,7 +127,6 @@ class TestGenericPollsters(test_base.BaseTestCase):
self.pollster = generic.GenericHardwareDeclarativePollster(self.conf)
def _setup_meter_def_file(self, cfg):
if six.PY3:
cfg = cfg.encode('utf-8')
meter_cfg_file = fileutils.write_to_tempfile(content=cfg,
prefix="snmp",

8
ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py
View File

@ -17,7 +17,6 @@ import tempfile
from unittest import mock
from oslotest import base
import six
from ceilometer.ipmi.platform import intel_node_manager as node_manager
from ceilometer.privsep import ipmitool
@ -25,8 +24,7 @@ from ceilometer import service
from ceilometer.tests.unit.ipmi.platform import fake_utils
@six.add_metaclass(abc.ABCMeta)
class _Base(base.BaseTestCase):
class _Base(base.BaseTestCase, metaclass=abc.ABCMeta):
@abc.abstractmethod
def init_test_engine(self):
@ -42,15 +40,11 @@ class _Base(base.BaseTestCase):
@staticmethod
def _new_no_singleton(cls, *args, **kwargs):
if six.PY3:
# We call init manually due to a py3 bug:
# https://bugs.python.org/issue25731
obj = super(node_manager.NodeManager, cls).__new__(cls)
obj.__init__(*args, **kwargs)
return obj
else:
return super(node_manager.NodeManager, cls).__new__(
cls, *args, **kwargs)
class TestNodeManagerV3(_Base):

4
ceilometer/tests/unit/ipmi/pollsters/base.py
View File

@ -16,15 +16,13 @@ import abc
from unittest import mock
import fixtures
import six
from ceilometer.polling import manager
from ceilometer import service
from ceilometer.tests import base
@six.add_metaclass(abc.ABCMeta)
class TestPollsterBase(base.BaseTestCase):
class TestPollsterBase(base.BaseTestCase, metaclass=abc.ABCMeta):
def setUp(self):
super(TestPollsterBase, self).setUp()

2
ceilometer/tests/unit/meter/test_notifications.py
View File

@ -17,7 +17,6 @@ from unittest import mock
import fixtures
from oslo_utils import encodeutils
from oslo_utils import fileutils
import six
import yaml
from ceilometer import declarative
@ -291,7 +290,6 @@ class TestMeterProcessing(test.BaseTestCase):
cfgs = [cfgs]
meter_cfg_files = list()
for cfg in cfgs:
if six.PY3:
cfg = cfg.encode('utf-8')
meter_cfg_files.append(fileutils.write_to_tempfile(content=cfg,
path=self.path,

3
ceilometer/tests/unit/network/statistics/opendaylight/test_client.py
View File

@ -17,7 +17,6 @@ from unittest import mock
from oslo_config import fixture as config_fixture
from oslotest import base
from requests import auth as req_auth
import six
from urllib import parse as urlparse
from ceilometer.i18n import _
@ -147,7 +146,7 @@ class TestClientHTTPBasicAuth(base.BaseTestCase):
_('OpenDaylight API returned %(status)s %(reason)s') %
{'status': self.resp.status_code,
'reason': self.resp.reason},
six.text_type(e))
str(e))
def test_other_error(self):

4
ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py
View File

@ -16,15 +16,13 @@ import abc
from unittest import mock
from oslotest import base
import six
from urllib import parse as urlparse
from ceilometer.network.statistics.opendaylight import driver
from ceilometer import service
@six.add_metaclass(abc.ABCMeta)
class _Base(base.BaseTestCase):
class _Base(base.BaseTestCase, metaclass=abc.ABCMeta):
@abc.abstractproperty
def flow_data(self):

4
ceilometer/tests/unit/pipeline_base.py
View File

@ -20,7 +20,6 @@ from unittest import mock
import fixtures
from oslo_utils import timeutils
import six
from ceilometer.pipeline import base as pipe_base
from ceilometer.pipeline import sample as pipeline
@ -31,8 +30,7 @@ from ceilometer import service
from ceilometer.tests import base
@six.add_metaclass(abc.ABCMeta)
class BasePipelineTestCase(base.BaseTestCase):
class BasePipelineTestCase(base.BaseTestCase, metaclass=abc.ABCMeta):
def get_publisher(self, conf, url, namespace=''):
fake_drivers = {'test://': test_publisher.TestPublisher,

2
ceilometer/tests/unit/publisher/test_gnocchi.py
View File

@ -26,7 +26,6 @@ from oslo_utils import fixture as utils_fixture
from oslo_utils import netutils
from oslo_utils import timeutils
import requests
import six
from stevedore import extension
import testscenarios
@ -281,7 +280,6 @@ class PublisherTest(base.BaseTestCase):
]
for content in contents:
if six.PY3:
content = content.encode('utf-8')
temp = fileutils.write_to_tempfile(content=content,

4
ceilometer/tests/unit/test_bin.py
View File

@ -17,7 +17,6 @@ import subprocess
import time
from oslo_utils import fileutils
import six
from ceilometer.tests import base
@ -27,7 +26,6 @@ class BinTestCase(base.BaseTestCase):
super(BinTestCase, self).setUp()
content = ("[DEFAULT]\n"
"transport_url = fake://\n")
if six.PY3:
content = content.encode('utf-8')
self.tempfile = fileutils.write_to_tempfile(content=content,
prefix='ceilometer',
@ -52,7 +50,6 @@ class BinSendSampleTestCase(base.BaseTestCase):
content = ("[DEFAULT]\n"
"transport_url = fake://\n"
"pipeline_cfg_file={0}\n".format(pipeline_cfg_file))
if six.PY3:
content = content.encode('utf-8')
self.tempfile = fileutils.write_to_tempfile(content=content,
@ -89,7 +86,6 @@ class BinCeilometerPollingServiceTestCase(base.BaseTestCase):
def test_starting_with_duplication_namespaces(self):
content = ("[DEFAULT]\n"
"transport_url = fake://\n")
if six.PY3:
content = content.encode('utf-8')
self.tempfile = fileutils.write_to_tempfile(content=content,
prefix='ceilometer',

3
ceilometer/tests/unit/test_notification.py
View File

@ -18,7 +18,6 @@ import time
from unittest import mock
from oslo_utils import fileutils
import six
import yaml
from ceilometer import messaging
@ -144,7 +143,6 @@ class BaseRealNotification(BaseNotificationTest):
'publishers': ['test://']
}]
})
if six.PY3:
pipeline = pipeline.encode('utf-8')
pipeline_cfg_file = fileutils.write_to_tempfile(content=pipeline,
@ -164,7 +162,6 @@ class BaseRealNotification(BaseNotificationTest):
'publishers': ['test://']
}]
})
if six.PY3:
ev_pipeline = ev_pipeline.encode('utf-8')
ev_pipeline_cfg_file = fileutils.write_to_tempfile(

3
requirements.txt
View File

@ -30,8 +30,7 @@ python-swiftclient>=3.2.0 # Apache-2.0
python-cinderclient>=3.3.0 # Apache-2.0
PyYAML>=5.1 # MIT
requests!=2.9.0,>=2.8.1 # Apache-2.0
six>=1.10.0 # MIT
stevedore>=3.0.0 # Apache-2.0
stevedore>=1.20.0 # Apache-2.0
tenacity>=4.12.0 # Apache-2.0
tooz[zake]>=1.47.0 # Apache-2.0
os-xenapi>=0.3.3 # Apache-2.0