datadog-checks-base 37.0.0__py2.py3-none-any.whl → 37.1.1__py2.py3-none-any.whl

datadog_checks/base/__about__.py

@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = "37.0.0"
+__version__ = "37.1.1"

datadog_checks/base/__init__.py

@@ -1,28 +1,20 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import PY3
-
-if PY3:
-    from datadog_checks.base.agent import datadog_agent
-
-    if datadog_agent.get_config('use_boringssl'):
-        import urllib3.contrib.pyopenssl
-
-        urllib3.contrib.pyopenssl.inject_into_urllib3()
+from datadog_checks.base.agent import datadog_agent
 
 from .__about__ import __version__
 from .checks import AgentCheck
 from .checks.openmetrics import OpenMetricsBaseCheck
+from .checks.openmetrics.v2.base import OpenMetricsBaseCheckV2
 from .config import is_affirmative
 from .errors import ConfigurationError
 from .utils.common import ensure_bytes, ensure_unicode, to_native_string, to_string
 
-# Python 3+
-try:
-    from .checks.openmetrics.v2.base import OpenMetricsBaseCheckV2
-except ImportError:
-    OpenMetricsBaseCheckV2 = None
+if datadog_agent.get_config('use_boringssl'):
+    import urllib3.contrib.pyopenssl
+
+    urllib3.contrib.pyopenssl.inject_into_urllib3()
 
 # Windows-only
 try:

datadog_checks/base/checks/base.py

@@ -27,7 +27,7 @@ from typing import (  # noqa: F401
 )
 
 import yaml
-from six import PY2, binary_type, iteritems, raise_from, text_type
+from pydantic import BaseModel, ValidationError
 
 from datadog_checks.base.agent import AGENT_RUNNING, aggregator, datadog_agent
 
@@ -84,9 +84,6 @@ if is_affirmative(datadog_agent.get_config('integration_profiling')):
     prof = Profiler(service='datadog-agent-integrations')
     prof.start()
 
-if not PY2:
-    from pydantic import BaseModel, ValidationError
-
 if TYPE_CHECKING:
     import ssl  # noqa: F401
 
@@ -305,8 +302,7 @@ class AgentCheck(object):
         # Functions that will be called exactly once (if successful) before the first check run
         self.check_initializations = deque()  # type: Deque[Callable[[], None]]
 
-        if not PY2:
-            self.check_initializations.append(self.load_configuration_models)
+        self.check_initializations.append(self.load_configuration_models)
 
         self.__formatted_tags = None
         self.__logs_enabled = None
@@ -506,11 +502,9 @@ class AgentCheck(object):
 
         known_options = {k for k, _ in models_config}  # type: Set[str]
 
-        if not PY2:
-
-            if isinstance(models_config, BaseModel):
-                # Also add aliases, if any
-                known_options.update(set(models_config.model_dump(by_alias=True)))
+        if isinstance(models_config, BaseModel):
+            # Also add aliases, if any
+            known_options.update(set(models_config.model_dump(by_alias=True)))
 
         unknown_options = [option for option in user_configs.keys() if option not in known_options]  # type: List[str]
 
@@ -562,8 +556,7 @@ class AgentCheck(object):
     def load_configuration_model(import_path, model_name, config, context):
         try:
             package = importlib.import_module(import_path)
-        # TODO: remove the type ignore when we drop Python 2
-        except ModuleNotFoundError as e:  # type: ignore
+        except ModuleNotFoundError as e:
             # Don't fail if there are no models
             if str(e).startswith('No module named '):
                 return
@@ -574,8 +567,7 @@ class AgentCheck(object):
         if model is not None:
             try:
                 config_model = model.model_validate(config, context=context)
-            # TODO: remove the type ignore when we drop Python 2
-            except ValidationError as e:  # type: ignore
+            except ValidationError as e:
                 errors = e.errors()
                 num_errors = len(errors)
                 message_lines = [
@@ -594,7 +586,7 @@ class AgentCheck(object):
                     )
                     message_lines.append('  {}'.format(error['msg']))
 
-                raise_from(ConfigurationError('\n'.join(message_lines)), None)
+                raise ConfigurationError('\n'.join(message_lines)) from None
             else:
                 return config_model
 
@@ -1123,7 +1115,7 @@ class AgentCheck(object):
             new_tags = []
             for hostname, source_map in external_tags:
                 new_tags.append((to_native_string(hostname), source_map))
-                for src_name, tags in iteritems(source_map):
+                for src_name, tags in source_map.items():
                     source_map[src_name] = self._normalize_tags_type(tags)
             datadog_agent.set_external_tags(new_tags)
         except IndexError:
@@ -1222,7 +1214,7 @@ class AgentCheck(object):
             prefix: A prefix to to add to the normalized name, default None
             fix_case: A boolean, indicating whether to make sure that the metric name returned is in "snake_case"
         """
-        if isinstance(metric, text_type):
+        if isinstance(metric, str):
             metric = unicodedata.normalize('NFKD', metric).encode('ascii', 'ignore')
 
         if fix_case:
@@ -1247,7 +1239,7 @@ class AgentCheck(object):
         This happens for legacy reasons, when we cleaned up some characters (like '-')
         which are allowed in tags.
         """
-        if isinstance(tag, text_type):
+        if isinstance(tag, str):
             tag = tag.encode('utf-8', 'ignore')
         tag = self.TAG_REPLACEMENT.sub(br'_', tag)
         tag = self.MULTIPLE_UNDERSCORE_CLEANUP.sub(br'_', tag)
@@ -1345,8 +1337,8 @@ class AgentCheck(object):
                 the event to be sent
         """
         # Enforce types of some fields, considerably facilitates handling in go bindings downstream
-        for key, value in iteritems(event):
-            if not isinstance(value, (text_type, binary_type)):
+        for key, value in event.items():
+            if not isinstance(value, (str, bytes)):
                 continue
 
             try:

datadog_checks/base/checks/libs/prometheus.py

@@ -6,7 +6,6 @@ from itertools import tee
 
 from prometheus_client.metrics_core import Metric
 from prometheus_client.parser import _parse_sample, _replace_help_escaping
-from six.moves import zip
 
 
 def text_fd_to_metric_families(fd):

datadog_checks/base/checks/libs/thread_pool.py

@@ -25,8 +25,7 @@
 import sys
 import threading
 import traceback
-
-from six.moves import queue, range
+import queue
 
 # Item pushed on the work queue to tell the worker threads to terminate
 SENTINEL = "QUIT"

datadog_checks/base/checks/openmetrics/base_check.py

@@ -4,7 +4,6 @@
 from copy import deepcopy
 
 import requests
-from six import PY2
 
 from ...errors import CheckException
 from ...utils.tracing import traced_class
@@ -183,5 +182,4 @@ class StandardFields(object):
     pass
 
 
-if not PY2:
-    StandardFields.__doc__ = '\n'.join('- `{}`'.format(field) for field in STANDARD_FIELDS)
+StandardFields.__doc__ = '\n'.join('- `{}`'.format(field) for field in STANDARD_FIELDS)

datadog_checks/base/checks/openmetrics/mixins.py

@@ -12,7 +12,6 @@ from re import compile
 
 import requests
 from prometheus_client.samples import Sample
-from six import PY3, iteritems, string_types
 
 from datadog_checks.base.agent import datadog_agent
 
@@ -23,9 +22,6 @@ from ...utils.http import RequestsWrapper
 from .. import AgentCheck
 from ..libs.prometheus import text_fd_to_metric_families
 
-if PY3:
-    long = int
-
 
 class OpenMetricsScraperMixin(object):
     # pylint: disable=E1101
@@ -110,7 +106,7 @@ class OpenMetricsScraperMixin(object):
         # We merge list and dictionaries from optional defaults & instance settings
         metrics = default_instance.get('metrics', []) + instance.get('metrics', [])
         for metric in metrics:
-            if isinstance(metric, string_types):
+            if isinstance(metric, str):
                 metrics_mapper[metric] = metric
             else:
                 metrics_mapper.update(metric)
@@ -273,7 +269,7 @@ class OpenMetricsScraperMixin(object):
         config['_type_override_patterns'] = {}
 
         with_wildcards = set()
-        for metric, type in iteritems(config['type_overrides']):
+        for metric, type in config['type_overrides'].items():
             if '*' in metric:
                 config['_type_override_patterns'][compile(translate(metric))] = type
                 with_wildcards.add(metric)
@@ -468,7 +464,7 @@ class OpenMetricsScraperMixin(object):
             if type_override:
                 metric.type = type_override
             elif scraper_config['_type_override_patterns']:
-                for pattern, new_type in iteritems(scraper_config['_type_override_patterns']):
+                for pattern, new_type in scraper_config['_type_override_patterns'].items():
                     if pattern.search(metric.name):
                         metric.type = new_type
                         break
@@ -518,7 +514,7 @@ class OpenMetricsScraperMixin(object):
                 watched['sets'] = {}
                 watched['keys'] = {}
                 watched['singles'] = set()
-                for key, val in iteritems(scraper_config['label_joins']):
+                for key, val in scraper_config['label_joins'].items():
                     labels = []
                     if 'labels_to_match' in val:
                         labels = val['labels_to_match']
@@ -542,7 +538,7 @@ class OpenMetricsScraperMixin(object):
             # Set dry run off
             scraper_config['_dry_run'] = False
             # Garbage collect unused mapping and reset active labels
-            for metric, mapping in list(iteritems(scraper_config['_label_mapping'])):
+            for metric, mapping in scraper_config['_label_mapping'].items():
                 for key in list(mapping):
                     if (
                         metric in scraper_config['_active_label_mapping']
@@ -599,7 +595,7 @@ class OpenMetricsScraperMixin(object):
 
     def transform_metadata(self, metric, scraper_config):
         labels = metric.samples[0][self.SAMPLE_LABELS]
-        for metadata_name, label_name in iteritems(scraper_config['metadata_label_map']):
+        for metadata_name, label_name in scraper_config['metadata_label_map'].items():
             if label_name in labels:
                 self.set_metadata(metadata_name, labels[label_name])
 
@@ -662,7 +658,7 @@ class OpenMetricsScraperMixin(object):
                 label_dict = {}
 
                 if get_all:
-                    for label_name, label_value in iteritems(sample_labels):
+                    for label_name, label_value in sample_labels.items():
                         if label_name in matching_labels:
                             continue
                         label_dict[label_name] = label_value
@@ -717,7 +713,7 @@ class OpenMetricsScraperMixin(object):
                     sample_labels.update(label_mapping[mapping_key][mapping_value])
 
             # Match with tuples of labels
-            for key, mapping_key in iteritems(keys):
+            for key, mapping_key in keys.items():
                 if mapping_key in matching_single_labels:
                     continue
 
@@ -806,7 +802,7 @@ class OpenMetricsScraperMixin(object):
 
                 return
             # check for wildcards in transformers
-            for transformer_name, transformer in iteritems(metric_transformers):
+            for transformer_name, transformer in metric_transformers.items():
                 if transformer_name.endswith('*') and metric.name.startswith(transformer_name[:-1]):
                     transformer(metric, scraper_config, transformer_name)
 
@@ -1058,7 +1054,7 @@ class OpenMetricsScraperMixin(object):
     def _compute_bucket_hash(self, tags):
         # we need the unique context for all the buckets
         # hence we remove the "le" tag
-        return hash(frozenset(sorted((k, v) for k, v in iteritems(tags) if k != 'le')))
+        return hash(frozenset(sorted((k, v) for k, v in tags.items() if k != 'le')))
 
     def _decumulate_histogram_buckets(self, metric):
         """
@@ -1174,7 +1170,7 @@ class OpenMetricsScraperMixin(object):
         custom_tags = scraper_config['custom_tags']
         _tags = list(custom_tags)
         _tags.extend(scraper_config['_metric_tags'])
-        for label_name, label_value in iteritems(sample[self.SAMPLE_LABELS]):
+        for label_name, label_value in sample[self.SAMPLE_LABELS].items():
             if label_name not in scraper_config['exclude_labels']:
                 if label_name in scraper_config['include_labels'] or len(scraper_config['include_labels']) == 0:
                     tag_name = scraper_config['labels_mapper'].get(label_name, label_name)

datadog_checks/base/checks/openmetrics/v2/base.py

@@ -1,13 +1,10 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-# TODO: remove ignore when we stop invoking Mypy with --py2
-# type: ignore
 from collections import ChainMap
 from contextlib import contextmanager
 
 from requests.exceptions import RequestException
-from six import raise_from
 
 from ....errors import ConfigurationError
 from ....utils.tracing import traced_class
@@ -75,7 +72,7 @@ class OpenMetricsBaseCheckV2(AgentCheck):
                     scraper.scrape()
                 except (ConnectionError, RequestException) as e:
                     self.log.error("There was an error scraping endpoint %s: %s", endpoint, str(e))
-                    raise_from(type(e)("There was an error scraping endpoint {}: {}".format(endpoint, e)), None)
+                    raise type(e)("There was an error scraping endpoint {}: {}".format(endpoint, e)) from None
 
     def configure_scrapers(self):
         """

datadog_checks/base/checks/openmetrics/v2/transform.py

@@ -4,8 +4,6 @@
 import re
 from copy import deepcopy
 
-from six import raise_from
-
 from ....config import is_affirmative
 from . import transformers
 
@@ -53,7 +51,7 @@ class MetricTransformer:
                     self.transformer_data[raw_metric_name] = self.compile_transformer(config)
                 except Exception as e:
                     error = f'Error compiling transformer for metric `{raw_metric_name}`: {e}'
-                    raise_from(type(e)(error), None)
+                    raise type(e)(error) from None
 
     def get(self, metric):
         metric_name = metric.name

datadog_checks/base/checks/openmetrics/v2/transformers/service_check.py

@@ -1,8 +1,6 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import raise_from
-
 from .....constants import ServiceCheck
 
 
@@ -56,7 +54,7 @@ def compile_service_check_statuses(modifiers):
         try:
             value = int(value)
         except Exception:
-            raise_from(TypeError(f'value `{value}` of parameter `status_map` does not represent an integer'), None)
+            raise TypeError(f'value `{value}` of parameter `status_map` does not represent an integer') from None
 
         if not isinstance(status_string, str):
             raise ValueError(f'status `{status_string}` for value `{value}` of parameter `status_map` is not a string')

datadog_checks/base/checks/prometheus/base_check.py

@@ -1,8 +1,6 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import string_types
-
 from ...errors import CheckException
 from ...utils.common import to_native_string
 from .. import AgentCheck
@@ -145,7 +143,7 @@ class GenericPrometheusCheck(AgentCheck):
         # We merge list and dictionaries from optional defaults & instance settings
         metrics = default_instance.get("metrics", []) + instance.get("metrics", [])
         for metric in metrics:
-            if isinstance(metric, string_types):
+            if isinstance(metric, str):
                 metrics_mapper[metric] = metric
             else:
                 metrics_mapper.update(metric)

datadog_checks/base/checks/prometheus/mixins.py

@@ -10,7 +10,6 @@ from math import isinf, isnan
 
 import requests
 from google.protobuf.internal.decoder import _DecodeVarint32  # pylint: disable=E0611,E0401
-from six import PY3, iteritems, itervalues
 
 from ...config import is_affirmative
 from ...utils.http import RequestsWrapper
@@ -18,9 +17,6 @@ from ...utils.prometheus import metrics_pb2
 from .. import AgentCheck
 from ..libs.prometheus import text_fd_to_metric_families
 
-if PY3:
-    long = int
-
 
 class PrometheusFormat:
     """
@@ -276,11 +272,11 @@ class PrometheusScraperMixin(object):
         """
         metric_name = '{}_{}'.format(_m, metric_suffix)
         expected_labels = {
-            (k, v) for k, v in iteritems(_metric["labels"]) if k not in PrometheusScraperMixin.UNWANTED_LABELS
+            (k, v) for k, v in _metric["labels"].items() if k not in PrometheusScraperMixin.UNWANTED_LABELS
         }
         for elt in messages[metric_name]:
             current_labels = {
-                (k, v) for k, v in iteritems(elt["labels"]) if k not in PrometheusScraperMixin.UNWANTED_LABELS
+                (k, v) for k, v in elt["labels"].items() if k not in PrometheusScraperMixin.UNWANTED_LABELS
             }
             # As we have two hashable objects we can compare them without any side effects
             if current_labels == expected_labels:
@@ -307,7 +303,7 @@ class PrometheusScraperMixin(object):
             # in the case of quantiles and buckets, they need to be grouped by labels
             if obj_map[_m] in ['summary', 'histogram'] and len(_obj.metric) > 0:
                 _label_exists = False
-                _metric_minus = {k: v for k, v in list(iteritems(_metric['labels'])) if k not in ['quantile', 'le']}
+                _metric_minus = {k: v for k, v in _metric['labels'].items() if k not in ['quantile', 'le']}
                 _metric_idx = 0
                 for mls in _obj.metric:
                     _tmp_lbl = {idx.name: idx.value for idx in mls.label}
@@ -327,13 +323,13 @@ class PrometheusScraperMixin(object):
                 _g.gauge.value = float(_metric['value'])
             elif obj_map[_m] == 'summary':
                 if '{}_count'.format(_m) in messages:
-                    _g.summary.sample_count = long(self.get_metric_value_by_labels(messages, _metric, _m, 'count'))
+                    _g.summary.sample_count = int(self.get_metric_value_by_labels(messages, _metric, _m, 'count'))
                 if '{}_sum'.format(_m) in messages:
                     _g.summary.sample_sum = self.get_metric_value_by_labels(messages, _metric, _m, 'sum')
             # TODO: see what can be done with the untyped metrics
             elif obj_map[_m] == 'histogram':
                 if '{}_count'.format(_m) in messages:
-                    _g.histogram.sample_count = long(self.get_metric_value_by_labels(messages, _metric, _m, 'count'))
+                    _g.histogram.sample_count = int(self.get_metric_value_by_labels(messages, _metric, _m, 'count'))
                 if '{}_sum'.format(_m) in messages:
                     _g.histogram.sample_sum = self.get_metric_value_by_labels(messages, _metric, _m, 'sum')
             # last_metric = len(_obj.metric) - 1
@@ -350,7 +346,7 @@ class PrometheusScraperMixin(object):
                     # _q = _obj.metric[last_metric].histogram.bucket.add()
                     _q = _g.histogram.bucket.add()
                     _q.upper_bound = float(_metric['labels'][lbl])
-                    _q.cumulative_count = long(float(_metric['value']))
+                    _q.cumulative_count = int(float(_metric['value']))
                 else:
                     # labels deduplication
                     is_in_labels = False
@@ -374,7 +370,7 @@ class PrometheusScraperMixin(object):
                 self._dry_run = False
             elif not self._watched_labels:
                 # build the _watched_labels set
-                for val in itervalues(self.label_joins):
+                for val in self.label_joins.values():
                     self._watched_labels.add(val['label_to_match'])
 
             for metric in self.parse_metric_family(response):
@@ -383,7 +379,7 @@ class PrometheusScraperMixin(object):
             # Set dry run off
             self._dry_run = False
             # Garbage collect unused mapping and reset active labels
-            for metric, mapping in list(iteritems(self._label_mapping)):
+            for metric, mapping in self._label_mapping.items():
                 for key in list(mapping):
                     if key not in self._active_label_mapping[metric]:
                         del self._label_mapping[metric][key]

datadog_checks/base/checks/win/winpdh.py

@@ -2,11 +2,10 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 import time
+import winreg
 from collections import defaultdict
 
 import win32pdh
-from six import iteritems, text_type
-from six.moves import winreg
 
 DATA_TYPE_INT = win32pdh.PDH_FMT_LONG
 DATA_TYPE_DOUBLE = win32pdh.PDH_FMT_DOUBLE
@@ -98,7 +97,7 @@ class WinPDHCounter(object):
         # names in the class "network interface"
         win32pdh.CollectQueryData(self.hq)
 
-        for inst, counter_handle in iteritems(self.counterdict):
+        for inst, counter_handle in self.counterdict.items():
             try:
                 t, val = win32pdh.GetFormattedCounterValue(counter_handle, self._precision)
                 ret[inst] = val
@@ -183,7 +182,7 @@ class WinPDHCounter(object):
             # check to see if this counter is in the list of counters for this class
             if c not in counters:
                 try:
-                    self.logger.debug("Index %s counter %s not in counter list", index, text_type(c))
+                    self.logger.debug("Index %s counter %s not in counter list", index, str(c))
                 except:  # noqa: E722, B001
                     # some unicode characters are not translatable here.  Don't fail just
                     # because we couldn't log
@@ -197,7 +196,7 @@ class WinPDHCounter(object):
                 break
             except:  # noqa: E722, B001
                 try:
-                    self.logger.info("Unable to make path with counter %s, trying next available", text_type(c))
+                    self.logger.info("Unable to make path with counter %s, trying next available", str(c))
                 except:  # noqa: E722, B001
                     self.logger.info("Unable to make path with counter index %s, trying next available", index)
         return path

datadog_checks/base/checks/win/winpdh_base.py

@@ -5,7 +5,6 @@ from collections import defaultdict
 from typing import Callable, Dict, List, Optional, Tuple  # noqa: F401
 
 import win32wnet
-from six import iteritems
 
 from ... import AgentCheck, is_affirmative
 from ...utils.containers import hash_mutable
@@ -171,7 +170,7 @@ class PDHBaseCheck(AgentCheck):
     def do_refresh_counters(self):
         if self.refresh_counters:
             self.log.debug('Refreshing counters')
-            for counter, values in list(iteritems(self._missing_counters)):
+            for counter, values in self._missing_counters.items():
                 self._make_counters(counter_data=([counter], values))
 
     def get_counter_values(self, counterobj):
@@ -187,7 +186,7 @@ class PDHBaseCheck(AgentCheck):
         for inst_name, dd_name, metric_func, counterobj in self._metrics[self.instance_hash]:
             try:
                 vals = self.get_counter_values(counterobj)
-                for instance_name, val in iteritems(vals):
+                for instance_name, val in vals.items():
                     tags = list(self._tags.get(self.instance_hash, []))  # type: List[str]
 
                     if not counterobj.is_single_instance():

datadog_checks/base/checks/win/wmi/__init__.py

@@ -3,8 +3,6 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from typing import Any, Dict, List, Optional, Tuple
 
-from six import iteritems
-
 from ... import AgentCheck
 from .sampler import WMISampler
 from .types import TagQuery, WMIFilter, WMIMetric, WMIObject, WMIProperties
@@ -177,7 +175,7 @@ class WinWMICheck(AgentCheck):
                 except TagQueryUniquenessFailure:
                     continue
 
-            for wmi_property, wmi_value in iteritems(wmi_obj):
+            for wmi_property, wmi_value in wmi_obj.items():
                 # skips any property not in arguments since SWbemServices.ExecQuery will return key prop properties
                 # https://msdn.microsoft.com/en-us/library/aa393866(v=vs.85).aspx
 

datadog_checks/base/checks/win/wmi/sampler.py

@@ -28,8 +28,6 @@ from threading import Event, Thread
 
 import pythoncom
 import pywintypes
-from six import iteritems, string_types, with_metaclass
-from six.moves import zip
 from win32com.client import Dispatch
 
 from .counter_type import UndefinedCalculator, get_calculator, get_raw
@@ -67,7 +65,7 @@ class ProviderArchitectureMeta(type):
         return provider in cls._AVAILABLE_PROVIDER_ARCHITECTURES
 
 
-class ProviderArchitecture(with_metaclass(ProviderArchitectureMeta, object)):
+class ProviderArchitecture(metaclass=ProviderArchitectureMeta):
     """
     Enumerate WMI Provider Architectures.
     """
@@ -349,7 +347,7 @@ class WMISampler(object):
         """
         formatted_wmi_object = CaseInsensitiveDict()
 
-        for property_name, property_raw_value in iteritems(current):
+        for property_name, property_raw_value in current.items():
             counter_type = self._property_counter_types.get(property_name)
             property_formatted_value = property_raw_value
 
@@ -429,7 +427,7 @@ class WMISampler(object):
         def build_where_clause(fltr):
             def add_to_bool_ops(k, v):
                 if isinstance(v, (tuple, list)):
-                    if len(v) == 2 and isinstance(v[0], string_types) and v[0].upper() in WQL_OPERATORS:
+                    if len(v) == 2 and isinstance(v[0], str) and v[0].upper() in WQL_OPERATORS:
                         # Append if: [WQL_OP, value]
                         #     PROPERTY: ['<WQL_OP>', '%bar']
                         #     PROPERTY: { <BOOL_OP>: ['<WQL_OP>', 'foo']}
@@ -473,7 +471,7 @@ class WMISampler(object):
                     #     - [WQL_OP, val]
                     #     - foo
                     #     - bar
-                    for k, v in iteritems(value):
+                    for k, v in value.items():
                         bool_op = default_bool_op
                         if k.upper() in BOOL_OPERATORS:
                             bool_op = k.upper()
@@ -481,7 +479,7 @@ class WMISampler(object):
                             # map NOT to NOR or NAND
                             bool_op = 'N{}'.format(default_bool_op)
                         add_to_bool_ops(bool_op, v)
-                elif isinstance(value, string_types) and '%' in value:
+                elif isinstance(value, str) and '%' in value:
                     # Override operator to LIKE if wildcard detected
                     # e.g.
                     # PROPERTY: 'foo%'  -> PROPERTY LIKE 'foo%'
@@ -492,7 +490,7 @@ class WMISampler(object):
                     # PROPERTY: 'bar'   -> PROPERTY = 'foo'
                     add_to_bool_ops(default_bool_op, [default_wql_op, value])
 
-                for bool_op, value in iteritems(bool_ops):
+                for bool_op, value in bool_ops.items():
                     if not len(value):
                         continue
 
@@ -501,9 +499,7 @@ class WMISampler(object):
                             (prop, x)
                             if isinstance(x, (tuple, list))
                             else (
-                                (prop, ('LIKE', x))
-                                if isinstance(x, string_types) and '%' in x
-                                else (prop, (default_wql_op, x))
+                                (prop, ('LIKE', x)) if isinstance(x, str) and '%' in x else (prop, (default_wql_op, x))
                             )
                         ),
                         value,