Replace six with python3 code style

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

Change-Id: I85a4d79396874670f1b36cb91cfba5da812c2839

3 files changed, 7 insertions, 11 deletions

diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index d83f985d..c018f651 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -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:
diff --git a/ceilometer/event/models.py b/ceilometer/event/models.py
index 2232cf2d..e9de7135 100644
--- a/ceilometer/event/models.py
+++ b/ceilometer/event/models.py
@@ -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]
diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py
index 6961ea93..5d94f6c5 100644
--- a/ceilometer/event/trait_plugins.py
+++ b/ceilometer/event/trait_plugins.py
@@ -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: