Merge "Replace basestring with six.string_types"

This commit is contained in:
Jenkins 2017-09-25 09:23:45 +00:00 committed by Gerrit Code Review
commit cd53cafa7b
2 changed files with 8 additions and 3 deletions

View File

@ -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:

View File

@ -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