Removed further six usage: six.string_types, six.integer_types, six.moves.urllib instances.

levkowetz · levkowetz · commit ab173cb2eb00 · 2020-03-05T20:46:58.000Z
- Legacy-Id: 17390
diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
@@ -1,14 +1,13 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
+# Copyright The IETF Trust 2014-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import re
-import six
 
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -82,7 +81,7 @@ def convert(self, value):
         if value is None:
             return None
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             match = TIMEDELTA_REGEX.search(value)
 
             if match:
@@ -97,7 +96,7 @@ def hydrate(self, bundle):
         value = super(TimedeltaField, self).hydrate(bundle)
 
         if value and not hasattr(value, 'seconds'):
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 try:
                     match = TIMEDELTA_REGEX.search(value)
 
@@ -125,7 +124,7 @@ def dehydrate(self, bundle, for_list=True):
         if callable(self.attribute):
             previous_obj = bundle.obj
             foreign_obj = self.attribute(bundle)
-        elif isinstance(self.attribute, six.string_types):
+        elif isinstance(self.attribute, str):
             foreign_obj = bundle.obj
 
             for attr in self._attrs:
diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # expiry of Internet Drafts
 
@@ -8,10 +8,9 @@
 from django.conf import settings
 
 import datetime, os, shutil, glob, re
-import six
 from pathlib import Path
-if six.PY3:
-    from typing import List, Tuple      # pyflakes:ignore
+
+from typing import List, Tuple      # pyflakes:ignore
 
 from ietf.utils import log
 from ietf.utils.mail import send_mail
diff --git a/ietf/doc/factories.py b/ietf/doc/factories.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -8,9 +8,8 @@
 import factory
 import factory.fuzzy
 import datetime
-import six
-if six.PY3:
-    from typing import Optional         # pyflakes:ignore
+
+from typing import Optional         # pyflakes:ignore
 
 from django.conf import settings
 
diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py
@@ -5,7 +5,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import json
-import six
 
 from django.utils.html import escape
 from django import forms
@@ -57,9 +56,9 @@ def parse_select2_value(self, value):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, six.integer_types):
+        if isinstance(value, int):
             value = str(value)
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             items = self.parse_select2_value(value)
             # accept both names and pks here
             names = [ i for i in items if not i.isdigit() ]
diff --git a/ietf/doc/migrations/0016_set_document_docalias_fk.py b/ietf/doc/migrations/0016_set_document_docalias_fk.py
@@ -1,11 +1,11 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-08 14:04
 
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import six
+
 import sys
 
 from tqdm import tqdm
@@ -18,7 +18,7 @@ def add_id_fk(o, a, nameid):
         n = getattr(o, a+'_id')
         if n:
             i = nameid[n]
-            if not isinstance(i, six.integer_types):
+            if not isinstance(i, int):
                 raise ValueError("Inappropriate value: %s: nameid[%s]: %s" % (o.__class__.__name__, n, i))
             if getattr(o, a+'2_id') != i:
                 setattr(o, a+'2_id', i)
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
@@ -7,7 +7,6 @@
 import io
 import os
 import rfc2html
-import six
 
 from django.db import models
 from django.core import checks
@@ -412,7 +411,7 @@ def meeting_related(self):
 
     def relations_that(self, relationship):
         """Return the related-document objects that describe a given relationship targeting self."""
-        if isinstance(relationship, six.string_types):
+        if isinstance(relationship, str):
             relationship = ( relationship, )
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
@@ -435,7 +434,7 @@ def all_relations_that(self, relationship, related=None):
 
     def relations_that_doc(self, relationship):
         """Return the related-document objects that describe a given relationship from self to other documents."""
-        if isinstance(relationship, six.string_types):
+        if isinstance(relationship, str):
             relationship = ( relationship, )
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -19,7 +19,7 @@
 
 from six.moves.http_cookies import SimpleCookie
 from pyquery import PyQuery
-from six.moves.urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 from tempfile import NamedTemporaryFile
 
 from django.urls import reverse as urlreverse
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
@@ -11,10 +11,9 @@
 import math
 import os
 import re
-import six
 
 from collections import defaultdict
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from django.conf import settings
 from django.contrib import messages
@@ -705,7 +704,7 @@ def get_initial_notify(doc,extra=None):
     receivers = []
 
     if extra:
-        if isinstance(extra, six.string_types):
+        if isinstance(extra, str):
             extra = extra.split(', ')
         receivers.extend(extra)
 
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
@@ -43,7 +43,7 @@
 import os
 import re
 
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from django.http import HttpResponse, Http404 , HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404, redirect
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -8,9 +8,8 @@
 import io
 import os
 import re
-import six
-if six.PY3:
-    from typing import Dict             # pyflakes:ignore
+
+from typing import Dict             # pyflakes:ignore
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
diff --git a/ietf/ipr/fields.py b/ietf/ipr/fields.py
@@ -5,7 +5,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import json
-import six
 
 from django.utils.html import escape
 from django import forms
@@ -54,7 +53,7 @@ def check_pks(self, pks):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             pks = self.parse_select2_value(value)
             # if the user posted a non integer value we need to remove it
             for key in pks:
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
@@ -8,7 +8,7 @@
 
 
 from pyquery import PyQuery
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from django.urls import reverse as urlreverse
 
diff --git a/ietf/liaisons/fields.py b/ietf/liaisons/fields.py
@@ -5,7 +5,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import json
-import six
 
 from django.utils.html import escape
 from django import forms
@@ -51,9 +50,9 @@ def check_pks(self, pks):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, six.integer_types):
+        if isinstance(value, int):
             value = str(value)
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             pks = self.parse_select2_value(value)
             value = self.model.objects.filter(pk__in=pks)
         if isinstance(value, LiaisonStatement):
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
@@ -10,7 +10,7 @@
 import shutil
 
 from pyquery import PyQuery
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from django.db import IntegrityError
 from django.db.models import Max
diff --git a/ietf/person/fields.py b/ietf/person/fields.py
@@ -5,10 +5,9 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import json
-import six
 
 from collections import Counter
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 from django import forms
 from django.core.validators import validate_email
@@ -90,7 +89,7 @@ def check_pks(self, pks):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             pks = self.parse_select2_value(value)
             if self.model == Person:
                 value = self.model.objects.filter(pk__in=pks)
diff --git a/ietf/person/models.py b/ietf/person/models.py
@@ -11,7 +11,7 @@
 import uuid
 
 from hashids import Hashids
-from six.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -108,7 +108,7 @@ def role_email(self, role_name, group=None):
         may be an object or the group acronym."""
         if group:
             from ietf.group.models import Group
-            if isinstance(group, six.string_types):
+            if isinstance(group, str):
                 group = Group.objects.get(acronym=group)
             e = Email.objects.filter(person=self, role__group=group, role__name=role_name)
         else:
diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py
@@ -17,7 +17,7 @@
 import base64
 import email.utils
 
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 from urllib.request import urlopen
 
 import debug                            # pyflakes:ignore
diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -13,7 +13,7 @@
 import os
 import re
 import subprocess
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 import debug        # pyflakes:ignore
 
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
@@ -9,7 +9,7 @@
 import re
 
 from urllib.request import Request, urlopen
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 from xml.dom import pulldom, Node
 
 from django.conf import settings
diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py
@@ -1,11 +1,10 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
-import six
 import re
 
 import debug                            # pyflakes:ignore
@@ -23,7 +22,7 @@ def to_python(self, value):
         if not value:
             return []
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             values = value.split(',')
             return [ x.strip() for x in values if x.strip() ]
         else:
diff --git a/ietf/utils/log.py b/ietf/utils/log.py
@@ -8,10 +8,9 @@
 import logging
 import inspect
 import os.path
-import six
 import traceback
-if six.PY3:
-    from typing import Callable         # pyflakes:ignore
+
+from typing import Callable         # pyflakes:ignore
 
 try:
     import syslog
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
diff --git a/ietf/utils/management/commands/coverage_changes.py b/ietf/utils/management/commands/coverage_changes.py
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
diff --git a/ietf/utils/management/commands/makefixture.py b/ietf/utils/management/commands/makefixture.py
diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py
diff --git a/ietf/utils/management/commands/tests.py b/ietf/utils/management/commands/tests.py
diff --git a/ietf/utils/migrations/0001_initial.py b/ietf/utils/migrations/0001_initial.py
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
