Python2/3 compatibility: replaced six.ensure_text() with either six.text_type or django's force_text(), depending on the case, and fixed a variable scope issue.

 - Legacy-Id: 16461

Author: levkowetz

changelog.py

@@ -43,8 +43,8 @@ class ChangeLogEntry:
     title = ""
 
 def parse(logfile):
-    ver_line = "^(\w+) \((\S+)\) (\S+;)? (?:urgency=(\S+))?$"
-    sig_line = "^ -- ([^<]+) <([^>]+)>  (.*?) *$"
+    ver_line = r"^(\w+) \((\S+)\) (\S+;)? (?:urgency=(\S+))?$"
+    sig_line = r"^ -- ([^<]+) <([^>]+)>  (.*?) *$"
     inf_line = r"^  \*\*(.*)\*\* *"
 
     entries = []

ietf/api/serializer.py

@@ -154,7 +154,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.ensure_text(field_value)
+                                self._current[name] = six.text_type(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:

ietf/community/views.py

@@ -202,7 +202,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.ensure_text(doc.ad) if doc.ad else "")
+        row.append(six.text_type(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

@@ -49,7 +49,7 @@ def item_pubdate(self, item):
         return item.time
 
     def item_author_name(self, item):
-        return six.ensure_text(item.by)
+        return six.text_type(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

@@ -83,7 +83,7 @@ def prepare_value(self, value):
             "model_name": self.model.__name__.lower()
         })
 
-        return ",".join(six.ensure_text(o.pk) for o in value)
+        return ",".join(six.text_type(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableDocumentsField, self).clean(value)

ietf/doc/mails.py

@@ -13,7 +13,7 @@
 from django.utils.html import strip_tags
 from django.conf import settings
 from django.urls import reverse as urlreverse
-from django.utils.encoding import force_str
+from django.utils.encoding import force_str, force_text
 
 import debug                            # pyflakes:ignore
 
@@ -128,7 +128,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot writeup was generated"
-    e.text = six.ensure_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
+    e.text = force_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
 
     # caller is responsible for saving, if necessary
     return e
@@ -140,7 +140,7 @@ def generate_ballot_rfceditornote(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "RFC Editor Note for ballot was generated"
-    e.text = six.ensure_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
+    e.text = force_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
     e.save()
 
     return e
@@ -185,7 +185,7 @@ def generate_last_call_announcement(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Last call announcement was generated"
-    e.text = six.ensure_text(mail)
+    e.text = force_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -205,7 +205,7 @@ def generate_approval_mail(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot approval text was generated"
-    e.text = six.ensure_text(mail)
+    e.text = force_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -288,7 +288,7 @@ def generate_publication_request(request, doc):
         approving_body = "IRSG"
         consensus_body = doc.group.acronym.upper()
     else:
-        approving_body = six.ensure_text(doc.stream)
+        approving_body = six.text_type(doc.stream)
         consensus_body = approving_body
 
     e = doc.latest_event(WriteupDocEvent, type="changed_rfc_editor_note_text")

ietf/doc/models.py

@@ -17,7 +17,7 @@
 from django.urls import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
-from django.utils.encoding import python_2_unicode_compatible
+from django.utils.encoding import python_2_unicode_compatible, force_text
 from django.utils.html import mark_safe
 
 import debug                            # pyflakes:ignore
@@ -880,7 +880,7 @@ class DocHistory(DocumentInfo):
     name = models.CharField(max_length=255)
 
     def __str__(self):
-        return six.ensure_text(self.doc.name)
+        return force_text(self.doc.name)
 
     def canonical_name(self):
         if hasattr(self, '_canonical_name'):
@@ -930,7 +930,7 @@ def document(self):
         return self.docs.first()
 
     def __str__(self):
-        return u"%s-->%s" % (self.name, ','.join([six.ensure_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
+        return u"%s-->%s" % (self.name, ','.join([force_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
     document_link = admin_link("document")
     class Meta:
         verbose_name = "document alias"

ietf/doc/templatetags/ietf_filters.py

@@ -17,6 +17,7 @@
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -198,7 +199,7 @@ def rfcnospace(string):
 @register.filter
 def prettystdname(string):
     from ietf.doc.utils import prettify_std_name
-    return prettify_std_name(six.ensure_text(string or ""))
+    return prettify_std_name(force_text(string or ""))
 
 @register.filter(name='rfcurl')
 def rfclink(string):
@@ -341,7 +342,7 @@ def expires_soon(x,request):
 
 @register.filter(name='startswith')
 def startswith(x, y):
-    return six.ensure_text(x).startswith(y)
+    return six.text_type(x).startswith(y)
 
 @register.filter
 def has_role(user, role_names):

ietf/doc/tests_review.py

@@ -101,10 +101,12 @@ def test_request_review(self):
 
         self.assertEqual(len(outbox),2)
         self.assertTrue('reviewteam Early' in outbox[0]['Subject'])
-#        debug.show("outbox[0]['To']")
+        if not 'reviewsecretary@' in outbox[0]['To']:
+            print(outbox[0].as_string())
         self.assertTrue('reviewsecretary@' in outbox[0]['To'])
         self.assertTrue('reviewteam3 Early' in outbox[1]['Subject'])
-#        debug.show("outbox[1]['To']")
+        if not 'reviewsecretary3@' in outbox[1]['To']:
+            print(outbox[1].as_string())
         self.assertTrue('reviewsecretary3@' in outbox[1]['To'])
 
         # set the reviewteamsetting for the secretary email alias, then do the post again

ietf/doc/utils_charter.py

@@ -9,12 +9,11 @@
 import os
 import re
 import shutil
-import six
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_text, force_text
 
 import debug                            # pyflakes:ignore
 
@@ -152,7 +151,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev,
     e.desc = "Ballot writeup was generated"
-    e.text = six.ensure_text(render_to_string("doc/charter/ballot_writeup.txt"))
+    e.text = force_text(render_to_string("doc/charter/ballot_writeup.txt"))
 
     # caller is responsible for saving, if necessary
     return e