Merged in branch/iola/shimfree@6083. This cleans up and moves relevant code from idrfc/ to doc/. There should now only be a bit of old wrapper code left in idrfc; that will go away when the remaining models which use it are cleaned up.

 - Legacy-Id: 6117

Author: levkowetz

ietf/bin/expire-ids

@@ -9,7 +9,7 @@ management.setup_environ(settings)
 
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
-from ietf.idrfc.expire import *
+from ietf.doc.expire import *
 
 if not in_draft_expire_freeze():
     for doc in get_expired_drafts():

ietf/bin/expire-last-calls

@@ -9,7 +9,7 @@ management.setup_environ(settings)
 
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
-from ietf.idrfc.lastcall import *
+from ietf.doc.lastcall import *
 
 drafts = get_expired_last_calls()
 for doc in drafts:

ietf/bin/notify-expirations

@@ -6,7 +6,7 @@ from ietf import settings
 from django.core import management
 management.setup_environ(settings)
 
-from ietf.idrfc.expire import get_soon_to_expire_drafts, send_expire_warning_for_draft
+from ietf.doc.expire import get_soon_to_expire_drafts, send_expire_warning_for_draft
 
 
 # notify about documents that expire within the next 2 weeks

ietf/bin/test-crawl

@@ -64,7 +64,7 @@ while urls:
         print "was fetching", url
         sys.exit(1)
     except:
-        print "FAIL", url
+        print 500, "%.3fs" % (datetime.datetime.now() - timestamp).total_seconds(), url, "FAIL (from %s)" % referrer
         print "============="
         print traceback.format_exc()
         print "============="
@@ -82,9 +82,15 @@ while urls:
                 ctype = ctype[:ctype.index(";")]
 
             if ctype == "text/html":
-                for u in extract_html_urls(r.content):
-                    if u not in visited and u not in urls:
-                        urls[u] = url
+                try:
+                    for u in extract_html_urls(r.content):
+                        if u not in visited and u not in urls:
+                            urls[u] = url
+                except:
+                    print "error extracting HTML urls from", url
+                    print "============="
+                    print traceback.format_exc()
+                    print "============="
         else:
             tags.append(u"FAIL (from %s)" % referrer)
 

ietf/idrfc/expire.py ietf/doc/expire.pyietf/idrfc/expire.py renamed to ietf/doc/expire.py

@@ -4,13 +4,13 @@
 from django.template.loader import render_to_string
 from django.db.models import Q
 
-import datetime, os, shutil, glob, re, itertools
+import datetime, os, shutil, glob, re
 
 from ietf.utils.mail import send_mail, send_mail_subj
-from ietf.idrfc.utils import log_state_changed
 from ietf.doc.models import Document, DocEvent, State, save_document_in_history, IESG_SUBSTATE_TAGS
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting
+from ietf.doc.utils import log_state_changed
 
 def expirable_draft(draft):
     """Return whether draft is in an expirable state or not. This is
@@ -82,7 +82,7 @@ def send_expire_warning_for_draft(doc):
     if to or cc:
         send_mail(request, to, frm,
                   u"Expiration impending: %s" % doc.file_tag(),
-                  "idrfc/expire_warning_email.txt",
+                  "doc/draft/expire_warning_email.txt",
                   dict(doc=doc,
                        state=state,
                        expiration=expiration
@@ -101,7 +101,7 @@ def send_expire_notice_for_draft(doc):
     send_mail(request, to,
               "I-D Expiring System <ietf-secretariat-reply@ietf.org>",
               u"I-D was expired %s" % doc.file_tag(),
-              "idrfc/id_expired_email.txt",
+              "doc/draft/id_expired_email.txt",
               dict(doc=doc,
                    state=state,
                    ))
@@ -128,14 +128,14 @@ def expire_draft(doc):
     save_document_in_history(doc)
     if doc.latest_event(type='started_iesg_process'):
         dead_state = State.objects.get(used=True, type="draft-iesg", slug="dead")
-        prev = doc.get_state("draft-iesg")
+        prev_state = doc.friendly_state()
         prev_tag = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
         prev_tag = prev_tag[0] if prev_tag else None
-        if prev != dead_state:
+        if doc.get_state("draft-iesg") != dead_state:
             doc.set_state(dead_state)
             if prev_tag:
                 doc.tags.remove(prev_tag)
-            log_state_changed(None, doc, system, prev, prev_tag)
+            log_state_changed(None, doc, system, doc.friendly_state(), prev_state)
 
         e = DocEvent(doc=doc, by=system)
         e.type = "expired_document"

ietf/doc/feeds.py

@@ -12,7 +12,7 @@
 
 from ietf.doc.models import *
 from ietf.doc.utils import augment_events_with_revision
-from ietf.idtracker.templatetags.ietf_filters import format_textarea
+from ietf.doc.templatetags.ietf_filters import format_textarea
 
 class DocumentChanges(Feed):
     feed_type = Atom1Feed

ietf/idrfc/lastcall.py ietf/doc/lastcall.pyietf/idrfc/lastcall.py renamed to ietf/doc/lastcall.py

@@ -3,26 +3,13 @@
 import datetime
 
 from django.conf import settings
-from django.db.models import Q
 
-from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo
-from ietf.idrfc.mails import *
-from ietf.idrfc.utils import *
 from ietf.doc.models import *
 from ietf.person.models import Person
-
-import debug
+from ietf.doc.utils import log_state_changed
+from ietf.doc.mails import *
 
 def request_last_call(request, doc):
-    try:
-        ballot = doc.idinternal.ballot
-    except BallotInfo.DoesNotExist:
-        ballot = generate_ballot(request, doc)
-
-    send_last_call_request(request, doc, ballot)
-    add_document_comment(request, doc, "Last Call was requested")
-
-def request_last_callREDESIGN(request, doc):
     if not doc.latest_event(type="changed_ballot_writeup_text"):
         generate_ballot_writeup(request, doc)
     if not doc.latest_event(type="changed_ballot_approval_text"):
@@ -39,14 +26,7 @@ def request_last_callREDESIGN(request, doc):
     e.desc = "Last call was requested"
     e.save()
 
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    request_last_call = request_last_callREDESIGN
-
 def get_expired_last_calls():
-    return InternetDraft.objects.filter(lc_expiration_date__lte=datetime.date.today(),
-                                        idinternal__cur_state__document_state_id=IDState.IN_LAST_CALL)
-
-def get_expired_last_callsREDESIGN():
     today = datetime.date.today()
     for d in Document.objects.filter(Q(states__type="draft-iesg", states__slug="lc")
                                     | Q(states__type="statchg", states__slug="in-lc")):
@@ -55,24 +35,6 @@ def get_expired_last_callsREDESIGN():
             yield d
 
 def expire_last_call(doc):
-    state = IDState.WAITING_FOR_WRITEUP
-
-    try:
-        ballot = doc.idinternal.ballot
-        if ballot.ballot_writeup and "Relevant content can frequently be found in the abstract" not in ballot.ballot_writeup:
-            state = IDState.WAITING_FOR_AD_GO_AHEAD
-    except BallotInfo.DoesNotExist:
-        pass
-
-    doc.idinternal.change_state(IDState.objects.get(document_state_id=state), None)
-    doc.idinternal.event_date = datetime.date.today()
-    doc.idinternal.save()
-
-    log_state_changed(None, doc, by="system", email_watch_list=False)
-
-    email_last_call_expired(doc)
-
-def expire_last_callREDESIGN(doc):
     if doc.type_id == 'draft':
         state = State.objects.get(used=True, type="draft-iesg", slug="writeupw")
         e = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
@@ -87,23 +49,19 @@ def expire_last_callREDESIGN(doc):
     else:
         raise ValueError("Unexpected document type to expire_last_call(): %s" % doc.type)
 
-    save_document_in_history(doc)
+    prev_state = doc.friendly_state()
 
+    save_document_in_history(doc)
     doc.set_state(state)
 
     prev_tag = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
     prev_tag = prev_tag[0] if prev_tag else None
     if prev_tag:
         doc.tags.remove(prev_tag)
 
-    e = log_state_changed(None, doc, Person.objects.get(name="(System)"), prev, prev_tag)
-
+    e = log_state_changed(None, doc, Person.objects.get(name="(System)"), doc.friendly_state(), prev_state)
+                    
     doc.time = e.time
     doc.save()
 
     email_last_call_expired(doc)
-
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    get_expired_last_calls = get_expired_last_callsREDESIGN
-    expire_last_call = expire_last_callREDESIGN
-