From d856989fdd5ff4384f86af3bf0d02948ed6ea644 Mon Sep 17 00:00:00 2001
From: Luong Anh Tuan <tuanla@vn.fujitsu.com>
Date: Mon, 10 Jul 2017 21:05:13 +0700
Subject: [PATCH] Replace basestring with six.string_types

https://wiki.openstack.org/wiki/Python3

Change-Id: I4e2ec11228e3476757e22e60b3704fade45a3948
---
 monasca_agent/collector/checks_d/kafka_consumer.py | 7 +++++--
 monasca_setup/detection/plugins/process.py         | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/monasca_agent/collector/checks_d/kafka_consumer.py b/monasca_agent/collector/checks_d/kafka_consumer.py
index 223a961d..9aef8b23 100644
--- a/monasca_agent/collector/checks_d/kafka_consumer.py
+++ b/monasca_agent/collector/checks_d/kafka_consumer.py
@@ -2,6 +2,9 @@
 
 import collections
 import logging
+
+import six
+
 import monasca_agent.collector.checks as checks
 
 try:
@@ -52,12 +55,12 @@ class KafkaCheck(checks.AgentCheck):
 
         try:
             for group, topics in raw_val.items():
-                assert isinstance(group, basestring)
+                assert isinstance(group, six.string_types)
                 if isinstance(topics, dict):
                     self.log.info("Found old config format, discarding partition list")
                     topics = topics.keys()
                 assert isinstance(topics, list)
-                assert isinstance(topics[0], basestring)
+                assert isinstance(topics[0], six.string_types)
                 consumer_groups[group] = topics
             return consumer_groups
         except Exception as e:
diff --git a/monasca_setup/detection/plugins/process.py b/monasca_setup/detection/plugins/process.py
index 922f4eee..8b34f327 100644
--- a/monasca_setup/detection/plugins/process.py
+++ b/monasca_setup/detection/plugins/process.py
@@ -4,6 +4,8 @@ import json
 import logging
 import yaml
 
+import six
+
 import monasca_setup.agent_config
 import monasca_setup.detection
 from monasca_setup.detection.utils import find_process_cmdline
@@ -108,7 +110,7 @@ class ProcessCheck(monasca_setup.detection.Plugin):
                 if found_process_names:
                     process_item['found_process_names'] = found_process_names
                     if 'exact_match' in process_item:
-                        if isinstance(process_item['exact_match'], basestring):
+                        if isinstance(process_item['exact_match'], six.string_types):
                             process_item['exact_match'] = (process_item['exact_match'].lower() == 'true')
                     else:
                         process_item['exact_match'] = False