Merged back fixes from production

- Legacy-Id: 17413
This commit is contained in:
Henrik Levkowetz 2020-03-09 17:59:44 +00:00
parent 0f6a886ae0
commit 6300c359b4
3 changed files with 8 additions and 5 deletions

View file

@ -3,9 +3,10 @@
# This script requires that the proper virtual python environment has been # This script requires that the proper virtual python environment has been
# invoked before start # invoked before start
import os
import sys
import datetime import datetime
import os
import requests
import sys
import syslog import syslog
# boilerplate # boilerplate
@ -19,7 +20,7 @@ import django
django.setup() django.setup()
from django.conf import settings from django.conf import settings
from ietf.sync.iana import fetch_protocol_page, parse_protocol_page, update_rfc_log_from_protocol_page from ietf.sync.iana import parse_protocol_page, update_rfc_log_from_protocol_page
def chunks(l, n): def chunks(l, n):
"""Split list l up in chunks of max size n.""" """Split list l up in chunks of max size n."""

View file

@ -47,7 +47,7 @@ log("Updating document metadata from RFC index from %s" % settings.RFC_EDITOR_IN
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
rfc_index_xml = requests.get(settings.RFC_EDITOR_INDEX_URL).text rfc_index_xml = requests.get(settings.RFC_EDITOR_INDEX_URL).raw
index_data = ietf.sync.rfceditor.parse_index(rfc_index_xml) index_data = ietf.sync.rfceditor.parse_index(rfc_index_xml)
errata_data = requests.get(settings.RFC_EDITOR_ERRATA_JSON_URL).json() errata_data = requests.get(settings.RFC_EDITOR_ERRATA_JSON_URL).json()

View file

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import requests
import socket import socket
import sys import sys
@ -20,7 +21,8 @@ from ietf.utils.log import log
log("Updating RFC Editor queue states from %s" % settings.RFC_EDITOR_QUEUE_URL) log("Updating RFC Editor queue states from %s" % settings.RFC_EDITOR_QUEUE_URL)
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
response = requests.get(settings.RFC_EDITOR_QUEUE_URL).text response = requests.get(settings.RFC_EDITOR_QUEUE_URL).raw
debug.type('response')
drafts, warnings = parse_queue(response) drafts, warnings = parse_queue(response)
for w in warnings: for w in warnings:
log(u"Warning: %s" % w) log(u"Warning: %s" % w)