summaryrefslogtreecommitdiff
path: root/ceilometer/declarative.py
diff options
context:
space:
mode:
authorkuangcx <kuangcx@inspur.com>2020-11-02 14:37:26 +0800
committerMatthias Runge <mrunge@redhat.com>2021-01-13 14:20:31 +0100
commitc0632ae9e0f2eecbf0da9578c88f7c85727244f8 (patch)
tree1aeec729f311f6c17d9b251770605902b006aa2a /ceilometer/declarative.py
parent71f3d092acaa56f0edb49bcd26814d4f67f953b4 (diff)
downloadceilometer-c0632ae9e0f2eecbf0da9578c88f7c85727244f8.tar.gz
Replace six with python3 code style
Co-authored by: Matthias Runge <mrunge@redhat.com> Change-Id: I85a4d79396874670f1b36cb91cfba5da812c2839
Diffstat (limited to 'ceilometer/declarative.py')
-rw-r--r--ceilometer/declarative.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ceilometer/declarative.py b/ceilometer/declarative.py
index 9fe367e9..ed59f9a9 100644
--- a/ceilometer/declarative.py
+++ b/ceilometer/declarative.py
@@ -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: