Drop six

With python2 not being supported anymore, let's drop six.

Change-Id: I22f3d28e22ad209806b78ad78f46671a74179157

os_collect_config/cfn.py

@@ -20,7 +20,7 @@ from keystoneclient.contrib.ec2 import utils as ec2_utils
 from lxml import etree
 from oslo_config import cfg
 from oslo_log import log
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from os_collect_config import common
 from os_collect_config import exc

os_collect_config/tests/test_cfn.py

@@ -20,10 +20,10 @@ import fixtures
 from lxml import etree
 from oslo_config import cfg
 import requests
-import six.moves.urllib.parse as urlparse
 import testtools
 from testtools import content as test_content
 from testtools import matchers
+import urllib.parse as urlparse
 
 from os_collect_config import cfn
 from os_collect_config import collect

os_collect_config/tests/test_ec2.py

@@ -21,8 +21,8 @@ import uuid
 import fixtures
 from oslo_config import cfg
 import requests
-import six.moves.urllib.parse as urlparse
 import testtools
+import urllib.parse as urlparse
 
 from os_collect_config import collect
 from os_collect_config import config_drive

os_collect_config/zaqar.py

@@ -17,7 +17,6 @@ import json
 from keystoneclient.v3 import client as keystoneclient
 from oslo_config import cfg
 from oslo_log import log
-import six
 from zaqarclient.queues.v1 import client as zaqarclient
 from zaqarclient import transport
 from zaqarclient.transport import request
@@ -74,7 +73,7 @@ class Collector(object):
         zaqar = self.zaqarclient.Client(endpoint, conf=conf, version=1.1)
 
         queue = zaqar.queue(CONF.zaqar.queue_id)
-        r = six.next(queue.pop())
+        r = next(queue.pop())
         return r.body
 
     def _create_req(self, endpoint, action, body):

requirements.txt

@@ -10,5 +10,4 @@ requests>=2.14.2 # Apache-2.0
 lxml!=3.7.0,>=3.4.1 # BSD
 oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-six>=1.10.0 # MIT
 dogpile.cache>=0.6.2 # BSD