Skip to content

Commit 66bff20

Browse files
committed
Remove legacy ballot_json view which has not worked for a while
- Legacy-Id: 6720
1 parent ce316c0 commit 66bff20

2 files changed

Lines changed: 0 additions & 43 deletions

File tree

ietf/doc/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
6767
(r'^(?P<name>[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_json),
6868
(r'^(?P<name>[A-Za-z0-9._+-]+)/ballotpopup/(?P<ballot_id>[0-9]+)/$', views_doc.ballot_popup),
69-
#(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.json$', views_doc.ballot_json), # legacy view
7069

7170
url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/$', views_draft.change_state, name='doc_change_state'), # IESG state
7271
url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/(?P<state_type>iana-action|iana-review)/$', views_draft.change_iana_state, name='doc_change_iana_state'),

ietf/doc/views_doc.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -732,48 +732,6 @@ def extract_name(s):
732732

733733
return HttpResponse(json.dumps(data, indent=2), mimetype='text/plain')
734734

735-
def ballot_json(request, name):
736-
# REDESIGN: this view needs to be deleted or updated
737-
def get_ballot(name):
738-
from ietf.doc.models import DocAlias
739-
alias = get_object_or_404(DocAlias, name=name)
740-
d = alias.document
741-
from ietf.idtracker.models import InternetDraft, BallotInfo
742-
from ietf.idrfc.idrfc_wrapper import BallotWrapper, IdWrapper, RfcWrapper
743-
id = None
744-
bw = None
745-
dw = None
746-
if (d.type_id=='draft'):
747-
id = get_object_or_404(InternetDraft, name=d.name)
748-
try:
749-
if not id.ballot.ballot_issued:
750-
raise Http404
751-
except BallotInfo.DoesNotExist:
752-
raise Http404
753-
754-
bw = BallotWrapper(id) # XXX Fixme: Eliminate this as we go forward
755-
# Python caches ~100 regex'es -- explicitly compiling it inside a method
756-
# (where you then throw away the compiled version!) doesn't make sense at
757-
# all.
758-
if re.search("^rfc([1-9][0-9]*)$", name):
759-
id.viewing_as_rfc = True
760-
dw = RfcWrapper(id)
761-
else:
762-
dw = IdWrapper(id)
763-
# XXX Fixme: Eliminate 'dw' as we go forward
764-
765-
try:
766-
b = d.latest_event(BallotDocEvent, type="created_ballot")
767-
except BallotDocEvent.DoesNotExist:
768-
raise Http404
769-
770-
return (bw, dw, b, d)
771-
772-
ballot, doc, b, d = get_ballot(name)
773-
response = HttpResponse(mimetype='text/plain')
774-
response.write(json.dumps(ballot.dict(), indent=2))
775-
return response
776-
777735
class AddCommentForm(forms.Form):
778736
comment = forms.CharField(required=True, widget=forms.Textarea)
779737

0 commit comments

Comments
 (0)