diff options
| author | kuangcx <kuangcx@inspur.com> | 2020-11-02 14:37:26 +0800 |
|---|---|---|
| committer | Matthias Runge <mrunge@redhat.com> | 2021-01-13 14:20:31 +0100 |
| commit | c0632ae9e0f2eecbf0da9578c88f7c85727244f8 (patch) | |
| tree | 1aeec729f311f6c17d9b251770605902b006aa2a /ceilometer/polling | |
| parent | 71f3d092acaa56f0edb49bcd26814d4f67f953b4 (diff) | |
| download | ceilometer-c0632ae9e0f2eecbf0da9578c88f7c85727244f8.tar.gz | |
Replace six with python3 code style
Co-authored by: Matthias Runge <mrunge@redhat.com>
Change-Id: I85a4d79396874670f1b36cb91cfba5da812c2839
Diffstat (limited to 'ceilometer/polling')
| -rw-r--r-- | ceilometer/polling/manager.py | 5 | ||||
| -rw-r--r-- | ceilometer/polling/plugin_base.py | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/ceilometer/polling/manager.py b/ceilometer/polling/manager.py index 3fc5c75d..6b9289d1 100644 --- a/ceilometer/polling/manager.py +++ b/ceilometer/polling/manager.py @@ -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: diff --git a/ceilometer/polling/plugin_base.py b/ceilometer/polling/plugin_base.py index df58093c..be275614 100644 --- a/ceilometer/polling/plugin_base.py +++ b/ceilometer/polling/plugin_base.py @@ -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""" |