Changed additional places to use IANA sync settings from settings.py

 - Legacy-Id: 5681

Author: levkowetz

ietf/bin/iana-changes-updates

@@ -46,15 +46,15 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 from ietf.sync.iana import *
 
-syslog.syslog("Updating history log with new changes from IANA from %s, period %s - %s" % (CHANGES_URL, start, end))
+syslog.syslog("Updating history log with new changes from IANA from %s, period %s - %s" % (settings.IANA_SYNC_CHANGES_URL, start, end))
 
 t = start
 while t < end:
     # the IANA server doesn't allow us to fetch more than a certain
     # period, so loop over the requested period and make multiple
     # requests if necessary
 
-    text = fetch_changes_json(CHANGES_URL, t, min(end, t + MAX_INTERVAL_ACCEPTED_BY_IANA))
+    text = fetch_changes_json(settings.IANA_SYNC_CHANGES_URL, t, min(end, t + MAX_INTERVAL_ACCEPTED_BY_IANA))
     changes = parse_changes_json(text)
     added_events, warnings = update_history_with_changes(changes, send_email=options.send_email)
 

ietf/sync/iana.py

@@ -9,11 +9,11 @@
 from ietf.idrfc.mails import email_owner, email_state_changed, email_authors
 from ietf.utils.timezone import *
 
-PROTOCOLS_URL = "http://www.iana.org/protocols/"
-CHANGES_URL = "http://datatracker.dev.icann.org:8080/data-tracker/changes"
+#PROTOCOLS_URL = "http://www.iana.org/protocols/"
+#CHANGES_URL = "http://datatracker.dev.icann.org:8080/data-tracker/changes"
 
 def fetch_protocol_page(url):
-    f = urllib2.urlopen(PROTOCOLS_URL)
+    f = urllib2.urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
     text = f.read()
     f.close()
     return text