clean up unnecessary usage of the six library (awx only supports py3)

awx/api/views/__init__.py

@@ -12,7 +12,6 @@ import requests
 import functools
 from base64 import b64encode
 from collections import OrderedDict, Iterable
-import six
 
 
 # Django
@@ -1435,7 +1434,7 @@ class HostList(HostRelatedSearchMixin, ListCreateAPIView):
         try:
             return super(HostList, self).list(*args, **kwargs)
         except Exception as e:
-            return Response(dict(error=_(six.text_type(e))), status=status.HTTP_400_BAD_REQUEST)
+            return Response(dict(error=_(str(e))), status=status.HTTP_400_BAD_REQUEST)
 
 
 class HostDetail(RelatedJobsPreventDeleteMixin, ControlledByScmMixin, RetrieveUpdateDestroyAPIView):
@@ -1878,7 +1877,7 @@ class InventoryScriptView(RetrieveAPIView):
         show_all = bool(request.query_params.get('all', ''))
         subset = request.query_params.get('subset', '')
         if subset:
-            if not isinstance(subset, six.string_types):
+            if not isinstance(subset, str):
                 raise ParseError(_('Inventory subset argument must be a string.'))
             if subset.startswith('slice'):
                 slice_number, slice_count = Inventory.parse_slice_params(subset)
@@ -2416,11 +2415,11 @@ class JobTemplateSurveySpec(GenericAPIView):
     serializer_class = EmptySerializer
 
     ALLOWED_TYPES = {
-        'text': six.string_types,
-        'textarea': six.string_types,
-        'password': six.string_types,
-        'multiplechoice': six.string_types,
-        'multiselect': six.string_types,
+        'text': str,
+        'textarea': str,
+        'password': str,
+        'multiplechoice': str,
+        'multiselect': str,
         'integer': int,
         'float': float
     }
@@ -2455,8 +2454,8 @@ class JobTemplateSurveySpec(GenericAPIView):
     def _validate_spec_data(new_spec, old_spec):
         schema_errors = {}
         for field, expect_type, type_label in [
-                ('name', six.string_types, 'string'),
-                ('description', six.string_types, 'string'),
+                ('name', str, 'string'),
+                ('description', str, 'string'),
                 ('spec', list, 'list of items')]:
             if field not in new_spec:
                 schema_errors['error'] = _("Field '{}' is missing from survey spec.").format(field)
@@ -2474,7 +2473,7 @@ class JobTemplateSurveySpec(GenericAPIView):
         old_spec_dict = JobTemplate.pivot_spec(old_spec)
         for idx, survey_item in enumerate(new_spec["spec"]):
             context = dict(
-                idx=six.text_type(idx),
+                idx=str(idx),
                 survey_item=survey_item
             )
             # General element validation
@@ -2486,7 +2485,7 @@ class JobTemplateSurveySpec(GenericAPIView):
                         field_name=field_name, **context
                     )), status=status.HTTP_400_BAD_REQUEST)
                 val = survey_item[field_name]
-                allow_types = six.string_types
+                allow_types = str
                 type_label = 'string'
                 if field_name == 'required':
                     allow_types = bool
@@ -2534,7 +2533,7 @@ class JobTemplateSurveySpec(GenericAPIView):
                 )))
 
             # Process encryption substitution
-            if ("default" in survey_item and isinstance(survey_item['default'], six.string_types) and
+            if ("default" in survey_item and isinstance(survey_item['default'], str) and
                     survey_item['default'].startswith('$encrypted$')):
                 # Submission expects the existence of encrypted DB value to replace given default
                 if qtype != "password":
@@ -2546,7 +2545,7 @@ class JobTemplateSurveySpec(GenericAPIView):
                 encryptedish_default_exists = False
                 if 'default' in old_element:
                     old_default = old_element['default']
-                    if isinstance(old_default, six.string_types):
+                    if isinstance(old_default, str):
                         if old_default.startswith('$encrypted$'):
                             encryptedish_default_exists = True
                         elif old_default == "":  # unencrypted blank string is allowed as DB value as special case
@@ -3075,8 +3074,8 @@ class WorkflowJobTemplateCopy(WorkflowsEnforcementMixin, CopyAPIView):
                 elif field_name in ['credentials']:
                     for cred in item.all():
                         if not user.can_access(cred.__class__, 'use', cred):
-                            logger.debug(six.text_type(
-                                'Deep copy: removing {} from relationship due to permissions').format(cred))
+                            logger.debug(
+                                'Deep copy: removing {} from relationship due to permissions'.format(cred))
                             item.remove(cred.pk)
             obj.save()