Removed six.text_type(), changed six.moves.urllib to plain urllib, and removed now unused six imports.

 - Legacy-Id: 17385

Author: levkowetz

ietf/api/serializer.py

@@ -1,12 +1,11 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import hashlib
 import json
-import six
 
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, FieldError
@@ -154,7 +153,7 @@ def end_object(self, obj):
                             if hasattr(field_value, "_meta"):
                                 self._current[name] = self.expand_related(field_value, name)
                             else:
-                                self._current[name] = six.text_type(field_value)
+                                self._current[name] = str(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:

ietf/bin/rfc-editor-index-updates

@@ -11,7 +11,7 @@ import sys
 import syslog
 import traceback
 
-from six.moves.urllib.request import urlopen
+from urllib.request import urlopen
 
 # boilerplate
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))

ietf/bin/rfc-editor-queue-updates

@@ -3,7 +3,7 @@
 import os
 import socket
 import sys
-from six.moves.urllib.request import urlopen
+from urllib.request import urlopen
 
 # boilerplate
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))

ietf/checks.py

@@ -5,12 +5,10 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
-import six
 import sys
 import time
 from textwrap import dedent
-if six.PY3:
-    from typing import List, Tuple      # pyflakes:ignore
+from typing import List, Tuple      # pyflakes:ignore
 
 import debug                            # pyflakes:ignore
 debug.debug = True

ietf/community/views.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 -*-
 
 
@@ -7,7 +7,6 @@
 import csv
 import datetime
 import json
-import six
 import uuid
 
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
@@ -204,7 +203,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         row.append(strip_tags(doc.friendly_state()))
         row.append(doc.group.acronym if doc.group else "")
-        row.append(six.text_type(doc.ad) if doc.ad else "")
+        row.append(str(doc.ad) if doc.ad else "")
         e = doc.latest_event()
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         writer.writerow([v.encode("utf-8") for v in row])

ietf/doc/feeds.py

@@ -1,11 +1,10 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
-import six
 
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
@@ -50,7 +49,7 @@ def item_pubdate(self, item):
         return item.time
 
     def item_author_name(self, item):
-        return six.text_type(item.by)
+        return str(item.by)
 
     def item_link(self, item):
         return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk

ietf/doc/fields.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
+# Copyright The IETF Trust 2014-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -83,7 +83,7 @@ def prepare_value(self, value):
             "model_name": self.model.__name__.lower()
         })
 
-        return ",".join(six.text_type(o.pk) for o in value)
+        return ",".join(str(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableDocumentsField, self).clean(value)

ietf/doc/mails.py

@@ -6,7 +6,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
-import six
 import textwrap
 
 from django.template.loader import render_to_string
@@ -288,7 +287,7 @@ def generate_publication_request(request, doc):
         approving_body = "IRSG"
         consensus_body = doc.group.acronym.upper()
     else:
-        approving_body = six.text_type(doc.stream)
+        approving_body = str(doc.stream)
         consensus_body = approving_body
 
     e = doc.latest_event(WriteupDocEvent, type="changed_rfc_editor_note_text")

ietf/doc/templatetags/ietf_filters.py

@@ -22,10 +22,11 @@
 
 import debug                            # pyflakes:ignore
 
+from ietf.doc.models import BallotDocEvent
 from ietf.doc.models import ConsensusDocEvent
-from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped
 from ietf.utils.html import sanitize_fragment
-from ietf.doc.models import BallotDocEvent
+from ietf.utils import log
+from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped
 
 register = template.Library()
 
@@ -70,7 +71,7 @@ def parse_email_list(value):
 
 
     """
-    if value and isinstance(value, (six.binary_type, six.text_type)): # testing for 'value' being true isn't necessary; it's a fast-out route
+    if value and isinstance(value, str): # testing for 'value' being true isn't necessary; it's a fast-out route
         addrs = re.split(", ?", value)
         ret = []
         for addr in addrs:
@@ -79,6 +80,8 @@ def parse_email_list(value):
                 name = email
             ret.append('<a href="mailto:%s">%s</a>' % ( email.replace('&', '&amp;'), escape(name) ))
         return mark_safe(", ".join(ret))
+    elif value and isinstance(value, bytes):
+        log.assertion('isinstance(value, str)')        
     else:
         return value
 
@@ -151,10 +154,12 @@ def sanitize(value):
 @register.filter(name='bracket')
 def square_brackets(value):
     """Adds square brackets around text."""
-    if isinstance(value, (six.binary_type, six.text_type)):
+    if isinstance(value, str):
         if value == "":
              value = " "
         return "[ %s ]" % value
+    elif isinstance(value, bytes):
+        log.assertion('isinstance(value, str)')
     elif value > 0:
         return "[ X ]"
     elif value < 0:
@@ -344,7 +349,7 @@ def expires_soon(x,request):
 
 @register.filter(name='startswith')
 def startswith(x, y):
-    return six.text_type(x).startswith(y)
+    return str(x).startswith(y)
 
 @register.filter
 def has_role(user, role_names):

ietf/doc/views_doc.py

@@ -42,7 +42,6 @@
 import json
 import os
 import re
-import six
 
 from six.moves.urllib.parse import quote
 
@@ -1397,7 +1396,7 @@ def add_sessionpresentation(request,name):
     if doc.group:
         sessions = sorted(sessions,key=lambda x:0 if x.group==doc.group else 1)
 
-    session_choices = [(s.pk, six.text_type(s)) for s in sessions]
+    session_choices = [(s.pk, str(s)) for s in sessions]
 
     if request.method == 'POST':
         version_form = VersionForm(request.POST,choices=version_choices)