Remove six

The six library was used to keep compatibility with both Python 2 and 3
but Python 3 support was already removed.

Change-Id: I5ab003d024f538469854b771279de6aafea90a16

adjutant/actions/utils.py

@@ -1,5 +1,3 @@
-import six
-
 from django.core.mail import EmailMultiAlternatives
 from django.template import loader
 
@@ -35,7 +33,7 @@ def send_email(to_addresses, context, conf, task):
 
     if not to_addresses:
         return
-    if isinstance(to_addresses, six.string_types):
+    if isinstance(to_addresses, str):
         to_addresses = [to_addresses]
     elif isinstance(to_addresses, set):
         to_addresses = list(to_addresses)

adjutant/actions/v1/misc.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from confspirator import groups
 from confspirator import fields
 from confspirator import types
@@ -146,7 +144,7 @@ class SendAdditionalEmailAction(BaseAction):
 
         if conf.get("email_task_cache"):
             task_emails = self.action.task.cache.get("additional_emails", [])
-            if isinstance(task_emails, six.string_types):
+            if isinstance(task_emails, str):
                 task_emails = [task_emails]
             for email in task_emails:
                 self.emails.add(email)

adjutant/tasks/v1/manager.py

@@ -14,8 +14,6 @@
 
 from logging import getLogger
 
-from six import string_types
-
 from adjutant import exceptions
 from adjutant import tasks
 from adjutant.tasks.models import Task
@@ -58,7 +56,7 @@ class TaskManager(object):
     def get(self, task):
         if isinstance(task, BaseTask):
             return task
-        if isinstance(task, string_types):
+        if isinstance(task, str):
             try:
                 task = Task.objects.get(uuid=task)
             except Task.DoesNotExist:

requirements.txt

@@ -13,6 +13,5 @@ python-neutronclient>=6.12.0
 python-novaclient>=14.0.0
 python-octaviaclient>=1.8.0
 python-troveclient>=6.0.1
-six>=1.12.0
 confspirator>=0.2.2
 importlib-metadata>=6.2.1