Python2/3 compatibility: Changed the use of open() and StringIO to io.open() etc.

 - Legacy-Id: 16458

Author: levkowetz

changelog.py

@@ -1,5 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, print_function, unicode_literals
 import re
+import six
 from tzparse import tzparse
 from datetime import datetime as Datetime
 
@@ -44,7 +48,7 @@ def parse(logfile):
     inf_line = r"^  \*\*(.*)\*\* *"
 
     entries = []
-    if type(logfile) == type(''):
+    if isinstance(logfile, six.string_types):
         logfile = open(logfile)
     entry = None
     for line in logfile:

ietf/api/__init__.py

@@ -1,7 +1,14 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
-import re
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-from urllib.parse import urlencode
+import re
+import six
+
+from six.moves.urllib.parse import urlencode
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -75,7 +82,7 @@ def convert(self, value):
         if value is None:
             return None
 
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             match = TIMEDELTA_REGEX.search(value)
 
             if match:
@@ -90,7 +97,7 @@ def hydrate(self, bundle):
         value = super(TimedeltaField, self).hydrate(bundle)
 
         if value and not hasattr(value, 'seconds'):
-            if isinstance(value, str):
+            if isinstance(value, six.string_types):
                 try:
                     match = TIMEDELTA_REGEX.search(value)
 
@@ -112,14 +119,17 @@ class ToOneField(tastypie.fields.ToOneField):
 
     def dehydrate(self, bundle, for_list=True):
         foreign_obj = None
+        previous_obj = None
+        attrib = None
 
         if callable(self.attribute):
             previous_obj = bundle.obj
             foreign_obj = self.attribute(bundle)
-        elif isinstance(self.attribute, str):
+        elif isinstance(self.attribute, six.string_types):
             foreign_obj = bundle.obj
 
             for attr in self._attrs:
+                attrib = attr
                 previous_obj = foreign_obj
                 try:
                     foreign_obj = getattr(foreign_obj, attr, None)
@@ -131,7 +141,7 @@ def dehydrate(self, bundle, for_list=True):
                 if callable(self.attribute):
                     raise ApiFieldError("The related resource for resource %s could not be found." % (previous_obj))
                 else:
-                    raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr))
+                    raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attrib))
             return None
 
         fk_resource = self.get_related_resource(foreign_obj)

ietf/api/serializer.py

@@ -1,6 +1,12 @@
 # Copyright The IETF Trust 2018-2019, 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
@@ -148,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] = str(field_value)
+                                self._current[name] = six.ensure_text(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:

ietf/community/views.py

@@ -1,16 +1,22 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import csv
-import uuid
 import datetime
 import json
+import six
+import uuid
 
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render
 from django.contrib.auth.decorators import login_required
 from django.utils.html import strip_tags
 
+import debug                            # pyflakes:ignore
+
 from ietf.community.models import SearchRule, EmailSubscription
 from ietf.community.forms import SearchRuleTypeForm, SearchRuleForm, AddDocumentsForm, SubscriptionForm
 from ietf.community.utils import lookup_community_list, can_manage_community_list
@@ -174,7 +180,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
 
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
 
-    writer = csv.writer(response, dialect=csv.excel, delimiter=',')
+    writer = csv.writer(response, dialect=csv.excel, delimiter=str(','))
 
     header = [
         "Name",
@@ -196,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(str(doc.ad) if doc.ad else "")
+        row.append(six.ensure_text(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])
@@ -221,7 +227,7 @@ def feed(request, username=None, acronym=None, group_type=None):
 
     host = request.get_host()
     feed_url = 'https://%s%s' % (host, request.get_full_path())
-    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url)
+    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, str(feed_url))
     title = '%s RSS Feed' % clist.long_name()
     if significant:
         subtitle = 'Significant document changes'