Remove more esoteric uses of 'six'

[iliakur]

What does this PR do?

Motivation

Additional Notes

Review checklist (to be filled by reviewers)

• Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
• Changelog entries must be created for modifications to shipped code
• Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
• If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

[codecov]

Codecov Report

Attention: Patch coverage is 88.69048% with 19 lines in your changes missing coverage. Please review.

Project coverage is 88.92%. Comparing base (db30fc0) to head (b93b554).
Report is 4 commits behind head on master.

Additional details and impacted files

Flag	Coverage Δ
activemq	52.80% <ø> (ø)
activemq_xml	82.20% <ø> (ø)
amazon_msk	89.19% <ø> (ø)
ambari	85.75% <ø> (ø)
apache	95.08% <ø> (ø)
arangodb	98.23% <ø> (ø)
argo_rollouts	90.00% <ø> (ø)
argo_workflows	87.87% <ø> (ø)
argocd	87.23% <ø> (ø)
avi_vantage	91.35% <ø> (ø)
aws_neuron	92.42% <ø> (ø)
azure_iot_edge	82.08% <ø> (ø)
boundary	100.00% <ø> (ø)
btrfs	82.69% <ø> (ø)
cacti	87.90% <ø> (ø)
calico	84.61% <ø> (ø)
cassandra	66.66% <ø> (ø)
cert_manager	77.41% <ø> (ø)
cisco_aci	95.03% <88.41%> (+0.06%)	⬆️
citrix_hypervisor	87.50% <ø> (ø)
cloud_foundry_api	96.11% <ø> (ø)
cloudera	99.51% <ø> (ø)
cockroachdb	93.85% <ø> (ø)
consul	91.80% <ø> (ø)
coredns	95.65% <ø> (ø)
couch	94.48% <ø> (-0.36%)	⬇️
crio	89.79% <ø> (ø)
datadog_checks_base	80.58% <ø> (+0.29%)	⬆️
datadog_checks_dev	77.65% <100.00%> (+0.09%)	⬆️
datadog_checks_downloader	81.35% <ø> (+3.23%)	⬆️
datadog_cluster_agent	90.19% <ø> (ø)
dcgm	92.10% <ø> (ø)
ddev	87.35% <ø> (ø)
directory	96.24% <100.00%> (+1.21%)	⬆️
disk	89.32% <ø> (ø)
dns_check	93.29% <ø> (ø)
druid	97.70% <ø> (ø)
ecs_fargate	83.48% <ø> (ø)
eks_fargate	94.05% <ø> (ø)
envoy	95.21% <ø> (+5.46%)	⬆️
esxi	93.21% <ø> (ø)
etcd	95.56% <ø> (ø)
external_dns	89.28% <ø> (ø)
fluentd	84.32% <ø> (ø)
fluxcd	88.31% <ø> (ø)
fly_io	97.13% <ø> (ø)
foundationdb	83.83% <ø> (ø)
gearmand	77.84% <ø> (ø)
gitlab_runner	92.10% <ø> (ø)
glusterfs	80.00% <ø> (ø)
go_expvar	92.66% <ø> (ø)
gunicorn	92.91% <ø> (ø)
harbor	89.65% <ø> (ø)
hazelcast	92.30% <ø> (ø)
hdfs_datanode	89.63% <ø> (ø)
hdfs_namenode	86.60% <ø> (ø)
hive	51.42% <ø> (ø)
hivemq	61.90% <ø> (ø)
http_check	93.99% <ø> (ø)
hudi	73.91% <ø> (ø)
ibm_db2	86.87% <ø> (ø)
ibm_i	81.91% <ø> (ø)
ibm_mq	91.31% <ø> (+43.76%)	⬆️
ignite	46.66% <ø> (ø)
impala	97.97% <ø> (ø)
istio	77.86% <ø> (ø)
jboss_wildfly	47.36% <ø> (ø)
kafka	64.70% <ø> (ø)
karpenter	95.06% <ø> (ø)
kong	88.42% <ø> (ø)
kube_apiserver_metrics	97.75% <ø> (ø)
kube_controller_manager	97.88% <ø> (ø)
kube_dns	95.94% <ø> (ø)
kube_metrics_server	94.87% <ø> (ø)
kube_proxy	96.80% <ø> (ø)
kube_scheduler	97.92% <ø> (ø)
kubeflow	93.22% <ø> (ø)
kubelet	90.99% <ø> (ø)
kubernetes_cluster_autoscaler	93.22% <ø> (ø)
kubernetes_state	89.49% <ø> (ø)
kubevirt_api	82.44% <ø> (ø)
kubevirt_controller	85.36% <ø> (ø)
kyototycoon	85.96% <ø> (ø)
kyverno	82.27% <ø> (ø)
lighttpd	83.64% <ø> (ø)
linkerd	84.70% <ø> (ø)
linux_proc_extras	96.20% <ø> (ø)
mapr	82.27% <ø> (ø)
mapreduce	81.99% <ø> (ø)
marathon	83.06% <ø> (ø)
mcache	93.48% <ø> (ø)
mesos_master	89.71% <ø> (ø)
mesos_slave	93.24% <ø> (ø)
nagios	89.01% <ø> (ø)
network	93.47% <ø> (ø)
nfsstat	95.20% <ø> (ø)
nginx	94.65% <ø> (ø)
nginx_ingress_controller	98.55% <ø> (ø)
nvidia_triton	88.52% <ø> (ø)
openldap	96.33% <ø> (ø)
openmetrics	98.05% <ø> (ø)
openstack	55.00% <ø> (ø)
pgbouncer	91.35% <ø> (ø)
php_fpm	90.45% <ø> (ø)
postfix	88.04% <ø> (ø)
powerdns_recursor	96.65% <ø> (ø)
presto	59.09% <ø> (ø)
process	85.57% <ø> (ø)
prometheus	94.17% <ø> (ø)
proxysql	98.97% <ø> (ø)
pulsar	100.00% <ø> (ø)
ray	96.45% <ø> (ø)
redisdb	87.72% <ø> (ø)
riak	99.21% <ø> (ø)
riakcs	88.82% <ø> (ø)
silk	93.82% <ø> (ø)
singlestore	90.81% <ø> (ø)
snowflake	96.27% <ø> (ø)
solr	56.25% <ø> (ø)
spark	94.14% <ø> (ø)
squid	100.00% <ø> (ø)
ssh_check	91.77% <ø> (ø)
statsd	87.36% <ø> (ø)
strimzi	89.78% <ø> (ø)
supervisord	89.78% <ø> (ø)
system_core	92.52% <ø> (ø)
system_swap	98.30% <ø> (ø)
tcp_check	90.39% <ø> (ø)
teamcity	87.25% <ø> (ø)
tekton	82.30% <ø> (ø)
teleport	99.61% <ø> (ø)
temporal	100.00% <ø> (ø)
teradata	94.05% <ø> (ø)
tibco_ems	91.98% <ø> (ø)
tls	91.68% <ø> (ø)
torchserve	97.32% <ø> (ø)
traefik_mesh	76.75% <ø> (ø)
traffic_server	96.13% <ø> (ø)
twemproxy	79.45% <ø> (ø)
twistlock	80.41% <ø> (ø)
varnish	84.22% <ø> (ø)
vllm	93.10% <ø> (ø)
vsphere	96.15% <ø> (ø)
weaviate	76.27% <ø> (ø)
win32_event_log	82.55% <ø> (ø)
wmi_check	97.50% <ø> (ø)
yarn	89.48% <ø> (ø)
zk	82.30% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.