Remove six.moves

Remove six.moves Replace the following items with Python 3 style code.
- six.moves.StringIO
- six.moves.reduce
- six.moves.urllib
- six.moves.http_client
- six.moves.queue

Subsequent patches will replace other six usages.

Change-Id: I48fa1dc87a99780975c0ae570ab70b5db3eca37a

vitrage/api_handler/apis/webhook.py

@@ -18,7 +18,7 @@ from oslo_log import log
 from oslo_utils import uuidutils
 from osprofiler import profiler
 import re
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 from vitrage.common.constants import TenantProps
 from vitrage.common.constants import VertexProperties as Vprops
 from vitrage.notifier.plugins.webhook.utils import db_row_to_dict

vitrage/datasources/nagios/parser.py

@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from io import StringIO
 from lxml import etree
 from oslo_log import log
 
-from six.moves import StringIO
 from vitrage.datasources.nagios.properties import NagiosProperties
 
 LOG = log.getLogger(__name__)

vitrage/datasources/prometheus/driver.py

@@ -20,7 +20,7 @@ from oslo_config import cfg
 from oslo_log import log
 import requests
 import six
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 from vitrage.common.constants import DatasourceAction
 from vitrage.common.constants import DatasourceOpts as DSOpts

vitrage/datasources/static/driver.py

@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from functools import reduce
 from itertools import chain
 from jsonschema import validate
-from six.moves import reduce
 
 from oslo_config import cfg
 from oslo_log import log

vitrage/evaluator/template_validation/content/v1/scenario_validator.py

@@ -12,11 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from functools import reduce
 from sympy.logic.boolalg import Not
 from sympy import Symbol
 
 from oslo_log import log
-from six.moves import reduce
 
 from vitrage.common.constants import EdgeProperties as EProps
 from vitrage.evaluator.condition import convert_to_dnf_format

vitrage/middleware/basic_and_keystone_auth.py

@@ -14,6 +14,7 @@
 
 import werkzeug.http
 
+from http import client as httplib
 from keystoneauth1.identity.generic import password
 from keystoneauth1 import loading
 from keystoneauth1 import session
@@ -22,7 +23,6 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
-from six.moves import http_client as httplib
 from webob import exc
 
 

vitrage/middleware/keycloak.py

@@ -15,6 +15,7 @@ import json
 import jwt
 import os
 import requests
+import urllib
 
 from cachetools import cached
 from cachetools import LRUCache
@@ -24,7 +25,6 @@ from oslo_log import log as logging
 from oslo_middleware import base
 from oslo_serialization import jsonutils
 from pecan.core import abort
-from six.moves import urllib
 from webob import exc
 
 

vitrage/storage/__init__.py

@@ -14,9 +14,9 @@
 
 from oslo_config import cfg
 from oslo_log import log
-import six.moves.urllib.parse as urlparse
 from stevedore import driver
 import tenacity
+from urllib import parse as urlparse
 
 from vitrage.utils.datetime import utcnow
 

vitrage/tests/functional/api/v1/test_basic.py

@@ -20,7 +20,7 @@ import uuid
 
 from datetime import datetime
 # noinspection PyPackageRequirements
-from six.moves import http_client as httplib
+from http import client as httplib
 from vitrage.tests.functional.api.v1 import FunctionalTest
 
 HEADERS = {

vitrage/tests/functional/entity_graph/consistency/test_consistency.py

@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import queue
 import time
 
 from oslo_config import cfg
-from six.moves import queue
 from testtools import matchers
 
 from vitrage.common.constants import EntityCategory

vitrage/tests/functional/evaluator/test_action_executor.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from six.moves import queue
+import queue
 
 from vitrage.common.constants import DatasourceAction
 from vitrage.common.constants import DatasourceProperties as DSProp

vitrage/tests/functional/evaluator/test_scenario_evaluator.py

@@ -18,7 +18,7 @@ from vitrage.tests.functional.test_configuration import TestConfiguration
 
 LOG = log.getLogger(__name__)
 
-from six.moves import queue
+import queue
 
 from oslo_config import cfg