From ebdad3a5a5dc09f824d4807b09f8a720e08f89bc Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 27 Feb 2020 13:39:45 +0000
Subject: [PATCH] Added charset decoding of data read from an urlopen() object
 in a few places, and removed some use-once functions that were now dead code.
  - Legacy-Id: 17355

---
 ietf/sync/iana.py      |  5 +++--
 ietf/sync/rfceditor.py | 12 ++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index b68f9758b..186272674 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -23,6 +23,7 @@ from ietf.doc.models import Document, DocEvent, State, StateDocEvent, StateType
 from ietf.doc.utils import add_state_change_event
 from ietf.person.models import Person
 from ietf.utils.mail import parseaddr
+from ietf.utils.text import decode
 from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
 
 
@@ -31,7 +32,7 @@ from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timez
 
 def fetch_protocol_page(url):
     f = urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
-    text = force_str(f.read())
+    text = decode(f.read())
     f.close()
     return text
     
@@ -80,7 +81,7 @@ def fetch_changes_json(url, start, end):
     password = settings.IANA_SYNC_PASSWORD
     request.add_header("Authorization", "Basic %s" % force_str(base64.encodestring(smart_bytes("%s:%s" % (username, password)))).replace("\n", ""))
     f = urlopen(request)
-    text = f.read()
+    text = decode(f.read())
     f.close()
     return text
 
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index 8dd3a758a..91ea4a760 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -7,7 +7,6 @@ from __future__ import absolute_import, print_function, unicode_literals
 import base64
 import datetime
 import re
-import socket
 import six
 
 from six.moves.urllib.request import Request, urlopen
@@ -28,6 +27,7 @@ from ietf.name.models import StdLevelName, StreamName
 from ietf.person.models import Person
 from ietf.utils.log import log
 from ietf.utils.mail import send_mail_text
+from ietf.utils.text import decode
 
 #QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
 #INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
@@ -45,10 +45,6 @@ def get_child_text(parent_node, tag_name):
     return '\n\n'.join(text)
 
 
-def fetch_queue_xml(url):
-    socket.setdefaulttimeout(30)
-    return urlopen(url)
-
 def parse_queue(response):
     """Parse RFC Editor queue XML into a bunch of tuples + warnings."""
 
@@ -234,10 +230,6 @@ def update_drafts_from_queue(drafts):
     return changed, warnings
 
 
-def fetch_index_xml(url):
-    socket.setdefaulttimeout(30)
-    return urlopen(url)
-
 def parse_index(response):
     """Parse RFC Editor index XML into a bunch of tuples."""
 
@@ -550,7 +542,7 @@ def post_approved_draft(url, name):
     text = error = ""
     try:
         f = urlopen(request, data=smart_bytes(urlencode({ 'draft': name })), timeout=20)
-        text = f.read()
+        text = decode(f.read())
         status_code = f.getcode()
         f.close()
         log("RFC-Editor notification result for draft '%s': %s:'%s'" % (name, status_code, text))