altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

mimetype -> content_type (mimetype is deprecated)

Browse source 
- Legacy-Id: 6945
This commit is contained in:
Ole Laursen 2013-12-16 16:53:47 +00:00
parent 85ab33533f
commit 84a9f49053
19 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/community/views.py
View file

@ -105,7 +105,7 @@ def add_document_to_list(request, clist, doc):
tup = settings.LOGIN_URL, REDIRECT_FIELD_NAME, path
return HttpResponseRedirect('%s?%s=%s' % tup)
clist.added_ids.add(doc)
return HttpResponse(json.dumps({'success': True}), mimetype='text/plain')
return HttpResponse(json.dumps({'success': True}), content_type='text/plain')
def remove_rule(request, list_id, rule_id):
@ -166,7 +166,7 @@ def _atom_view(request, clist, significant=False):
'id': feed_id.get_urn(),
'updated': datetime.datetime.today(),
},
mimetype='text/xml',
content_type='text/xml',
context_instance=RequestContext(request))
@ -194,7 +194,7 @@ def significant_group_list(request, acronym):
def _csv_list(request, clist):
display_config = clist.get_display_config()
response = HttpResponse(mimetype='text/csv')
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=draft-list.csv'
writer = csv.writer(response, dialect=csv.excel, delimiter=',')

2
ietf/doc/views_doc.py
View file

@ -735,7 +735,7 @@ def document_json(request, name):
data["consensus"] = e.consensus if e else None
data["stream"] = extract_name(doc.stream)
return HttpResponse(json.dumps(data, indent=2), mimetype='text/plain')
return HttpResponse(json.dumps(data, indent=2), content_type='text/plain')
class AddCommentForm(forms.Form):
comment = forms.CharField(required=True, widget=forms.Textarea)

2
ietf/group/ajax.py
View file

@ -17,5 +17,5 @@ def group_json(request, groupname):
#print "group request is: %s\n" % (request.build_absolute_uri('/'))
return HttpResponse(json.dumps(group.json_dict(request.build_absolute_uri('/')),
sort_keys=True, indent=2),
mimetype="text/json")
content_type="text/json")

10
ietf/iesg/views.py
View file

@ -167,7 +167,7 @@ def agenda_json(request, date=None):
s["docs"].append(docinfo)
return HttpResponse(json.dumps(res, indent=2), mimetype='text/plain')
return HttpResponse(json.dumps(res, indent=2), content_type='text/plain')
def agenda(request, date=None):
data = agenda_data(date)
@ -187,7 +187,7 @@ def agenda_txt(request, date=None):
return render_to_response("iesg/agenda.txt", {
"date": data["date"],
"sections": sorted(data["sections"].iteritems()),
}, context_instance=RequestContext(request), mimetype="text/plain")
}, context_instance=RequestContext(request), content_type="text/plain")
def agenda_scribe_template(request, date=None):
data = agenda_data(date)
@ -261,7 +261,7 @@ def agenda_package(request, date=None):
"roll_call": data["sections"]["1.1"]["text"],
"minutes": data["sections"]["1.3"]["text"],
"management_items": [(num, section) for num, section in data["sections"].iteritems() if "6" < num < "7"],
}, context_instance=RequestContext(request), mimetype='text/plain')
}, context_instance=RequestContext(request), content_type='text/plain')
def agenda_documents_txt(request):
@ -289,7 +289,7 @@ def agenda_documents_txt(request):
d.rev,
)
rows.append("\t".join(row))
return HttpResponse(u"\n".join(rows), mimetype='text/plain')
return HttpResponse(u"\n".join(rows), content_type='text/plain')
class RescheduleForm(forms.Form):
telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False)
@ -371,7 +371,7 @@ def telechat_docs_tarfile(request, date):
if d.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date == date:
docs.append(d)
response = HttpResponse(mimetype='application/octet-stream')
response = HttpResponse(content_type='application/octet-stream')
response['Content-Disposition'] = 'attachment; filename=telechat-%s-docs.tgz' % date.isoformat()
tarstream = tarfile.open('', 'w:gz', response)

2
ietf/ietfauth/views.py
View file

@ -227,7 +227,7 @@ def ajax_check_username(request):
error = False
if User.objects.filter(username=username).count():
error = _('This email address is already registered')
return HttpResponse(json.dumps({'error': error}), mimetype='text/plain')
return HttpResponse(json.dumps({'error': error}), content_type='text/plain')
def test_email(request):
"""Set email address to which email generated in the system will be sent."""

2
ietf/ipr/views.py
View file

@ -97,5 +97,5 @@ def iprs_for_drafts_txt(request):
for name, iprs in docipr.iteritems():
lines.append(name + "\t" + "\t".join(unicode(ipr_id) for ipr_id in sorted(iprs)))
return HttpResponse("\n".join(lines), mimetype="text/plain")
return HttpResponse("\n".join(lines), content_type="text/plain")

2
ietf/liaisons/views.py
View file

@ -81,7 +81,7 @@ def get_info(request):
result.update({'full_list': full_list})
json_result = json.dumps(result)
return HttpResponse(json_result, mimetype='text/javascript')
return HttpResponse(json_result, content_type='text/javascript')
def normalize_sort(request):
sort = request.GET.get('sort', "")

26
ietf/meeting/ajax.py
View file

@ -162,7 +162,7 @@ def timeslot_roomlist(request, mtg):
for room in rooms:
json_array.append(room.json_dict(request.build_absolute_uri('/')))
return HttpResponse(json.dumps(json_array),
mimetype="application/json")
content_type="application/json")
@role_required('Secretariat')
def timeslot_addroom(request, meeting):
@ -208,7 +208,7 @@ def timeslot_roomurl(request, num=None, roomid=None):
if request.method == 'GET':
room = get_object_or_404(meeting.room_set, pk=roomid)
return HttpResponse(json.dumps(room.json_dict(request.build_absolute_uri('/'))),
mimetype="application/json")
content_type="application/json")
# XXX FIXME: timeslot_updroom() doesn't exist
# elif request.method == 'PUT':
# return timeslot_updroom(request, meeting)
@ -227,7 +227,7 @@ def timeslot_slotlist(request, mtg):
for slot in slots:
json_array.append(slot.json_dict(request.build_absolute_uri('/')))
return HttpResponse(json.dumps(json_array),
mimetype="application/json")
content_type="application/json")
@role_required('Secretariat')
def timeslot_addslot(request, meeting):
@ -278,7 +278,7 @@ def timeslot_sloturl(request, num=None, slotid=None):
if request.method == 'GET':
slot = get_object_or_404(meeting.timeslot_set, pk=slotid)
return HttpResponse(json.dumps(slot.json_dict(request.build_absolute_uri('/'))),
mimetype="application/json")
content_type="application/json")
elif request.method == 'PUT':
# not yet implemented!
#return timeslot_updslot(request, meeting)
@ -299,7 +299,7 @@ def agenda_list(request, mtg):
for agenda in agendas:
json_array.append(agenda.json_dict(request.build_absolute_uri('/')))
return HttpResponse(json.dumps(json_array),
mimetype="application/json")
content_type="application/json")
# duplicates save-as functionality below.
@role_required('Area Director','Secretariat')
@ -362,7 +362,7 @@ def agenda_update(request, meeting, schedule):
if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
mimetype="application/json")
content_type="application/json")
else:
return HttpResponseRedirect(
reverse(edit_agenda, args=[meeting.number, schedule.name]))
@ -397,7 +397,7 @@ def agenda_infourl(request, num=None, schedule_name=None):
if request.method == 'GET':
return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
mimetype="application/json")
content_type="application/json")
elif request.method == 'PUT':
return agenda_update(request, meeting, schedule)
elif request.method == 'DELETE':
@ -412,7 +412,7 @@ def agenda_infourl(request, num=None, schedule_name=None):
def meeting_get(request, meeting):
return HttpResponse(json.dumps(meeting.json_dict(request.build_absolute_uri('/')),
sort_keys=True, indent=2),
mimetype="application/json")
content_type="application/json")
@role_required('Secretariat')
def meeting_update(request, meeting):
@ -463,11 +463,11 @@ def session_json(request, num, sessionid):
# return json.dumps({'error':"no such session %s" % sessionid})
return HttpResponse(json.dumps({'error':"no such session %s" % sessionid}),
status = 404,
mimetype="application/json")
content_type="application/json")
sess1 = session.json_dict(request.build_absolute_uri('/'))
return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2),
mimetype="application/json")
content_type="application/json")
# Would like to cache for 1 day, but there are invalidation issues.
#@cache_page(86400)
@ -479,11 +479,11 @@ def constraint_json(request, num, constraintid):
except Constraint.DoesNotExist:
return HttpResponse(json.dumps({'error':"no such constraint %s" % constraintid}),
status = 404,
mimetype="application/json")
content_type="application/json")
json1 = constraint.json_dict(request.get_host_protocol())
return HttpResponse(json.dumps(json1, sort_keys=True, indent=2),
mimetype="application/json")
content_type="application/json")
# Cache for 2 hour2
@ -505,7 +505,7 @@ def session_constraints(request, num, sessionid):
sort_keys=True, indent=2),
#print " gives: %s" % (json_str)
return HttpResponse(json_str, mimetype="application/json")
return HttpResponse(json_str, content_type="application/json")

22
ietf/meeting/views.py
View file

@ -195,7 +195,7 @@ def edit_timeslots(request, num=None):
"slot_slices": slots,
"date_slices":date_slices,
"meeting":meeting},
RequestContext(request)), mimetype="text/html")
RequestContext(request)), content_type="text/html")
##############################################################################
#@role_required('Area Director','Secretariat')
@ -239,7 +239,7 @@ def edit_agenda(request, num=None, schedule_name=None):
{"schedule":schedule,
"meeting": meeting,
"meeting_base_url":meeting_base_url},
RequestContext(request)), status=403, mimetype="text/html")
RequestContext(request)), status=403, content_type="text/html")
sessions = meeting.sessions_that_can_meet.order_by("id", "group", "requested_by")
scheduledsessions = get_all_scheduledsessions_from_schedule(schedule)
@ -280,7 +280,7 @@ def edit_agenda(request, num=None, schedule_name=None):
"session_jsons": session_jsons,
"scheduledsessions": scheduledsessions,
"show_inline": set(["txt","htm","html"]) },
RequestContext(request)), mimetype="text/html")
RequestContext(request)), content_type="text/html")
##############################################################################
# show the properties associated with an agenda (visible, public)
@ -300,7 +300,7 @@ def edit_agenda_properties(request, num=None, schedule_name=None):
{"schedule":schedule,
"form":form,
"meeting":meeting},
RequestContext(request)), mimetype="text/html")
RequestContext(request)), content_type="text/html")
##############################################################################
# show list of agendas.
@ -327,7 +327,7 @@ def edit_agendas(request, num=None, order=None):
"schedules": schedules.all()
},
RequestContext(request)),
mimetype="text/html")
content_type="text/html")
def agenda(request, num=None, name=None, base=None, ext=None):
base = base if base else 'agenda'
@ -339,7 +339,7 @@ def agenda(request, num=None, name=None, base=None, ext=None):
schedule = get_schedule(meeting, name)
updated = meeting_updated(meeting)
return HttpResponse(render_to_string("meeting/"+base+ext,
{"schedule":schedule, "updated": updated}, RequestContext(request)), mimetype=mimetype[ext])
{"schedule":schedule, "updated": updated}, RequestContext(request)), content_type=mimetype[ext])
def read_agenda_file(num, doc):
# XXXX FIXME: the path fragment in the code below should be moved to
@ -369,9 +369,9 @@ def session_agenda(request, num, session):
ext = ext.lstrip(".").lower()
if ext == "txt":
return HttpResponse(content, mimetype="text/plain")
return HttpResponse(content, content_type="text/plain")
elif ext == "pdf":
return HttpResponse(content, mimetype="application/pdf")
return HttpResponse(content, content_type="application/pdf")
else:
return HttpResponse(content)
@ -455,7 +455,7 @@ def session_draft_list(num, session):
def session_draft_tarfile(request, num, session):
drafts = session_draft_list(num, session);
response = HttpResponse(mimetype='application/octet-stream')
response = HttpResponse(content_type='application/octet-stream')
response['Content-Disposition'] = 'attachment; filename=%s-drafts.tgz'%(session)
tarstream = tarfile.open('','w:gz',response)
mfh, mfn = mkstemp()
@ -522,7 +522,7 @@ def session_draft_pdf(request, num, session):
os.unlink(pmn)
os.unlink(pdfn)
return HttpResponse(pdf_contents, mimetype="application/pdf")
return HttpResponse(pdf_contents, content_type="application/pdf")
def week_view(request, num=None):
meeting = get_meeting(num)
@ -572,7 +572,7 @@ def ical_agenda(request, num=None, name=None, ext=None):
return HttpResponse(render_to_string("meeting/agenda.ics",
{"schedule":schedule, "assignments":assignments, "updated":updated},
RequestContext(request)), mimetype="text/calendar")
RequestContext(request)), content_type="text/calendar")
def meeting_requests(request, num=None) :
meeting = get_meeting(num)

2
ietf/nomcom/views.py
View file

@ -841,4 +841,4 @@ def ajax_position_text(request, position_id):
result = {'text': position_text}
json_result = json.dumps(result)
return HttpResponse(json_result, mimetype='application/json')
return HttpResponse(json_result, content_type='application/json')

2
ietf/person/ajax.py
View file

@ -16,5 +16,5 @@ def person_json(request, personid):
return HttpResponse(json.dumps(person.json_dict(request.build_absolute_uri("/")),
sort_keys=True, indent=2),
mimetype="text/json")
content_type="text/json")

2
ietf/person/views.py
View file

@ -5,4 +5,4 @@ from ietf.person.forms import json_emails
def ajax_search_emails(request):
emails = Email.objects.filter(person__alias__name__icontains=request.GET.get('q','')).filter(active='true').order_by('person__name').distinct()[:10]
return HttpResponse(json_emails(emails), mimetype='application/json')
return HttpResponse(json_emails(emails), content_type='application/json')

4
ietf/secr/areas/views.py
View file

@ -32,7 +32,7 @@ def getpeople(request):
full = '%s - (%s)' % (item.name,item.id)
result.append(full)
return HttpResponse(json.dumps(result), mimetype='application/javascript')
return HttpResponse(json.dumps(result), content_type='application/javascript')
def getemails(request):
"""
@ -47,7 +47,7 @@ def getemails(request):
d = {'id': item.address, 'value': item.address}
results.append(d)
return HttpResponse(json.dumps(results), mimetype='application/javascript')
return HttpResponse(json.dumps(results), content_type='application/javascript')
# --------------------------------------------------
# STANDARD VIEW FUNCTIONS

4
ietf/secr/groups/views.py
View file

@ -76,7 +76,7 @@ def get_ads(request):
d = {'id': item.id, 'value': item.person.first_name + ' ' + item.person.last_name}
results.append(d)
return HttpResponse(json.dumps(results), mimetype='application/javascript')
return HttpResponse(json.dumps(results), content_type='application/javascript')
'''
# -------------------------------------------------
# Standard View Functions
@ -156,7 +156,7 @@ def blue_dot(request):
return render_to_response('groups/blue_dot_report.txt', {
'chairs':sorted_chairs},
RequestContext(request, {}), mimetype="text/plain",
RequestContext(request, {}), content_type="text/plain",
)
def charter(request, acronym):

2
ietf/secr/lib/template.py
View file

@ -24,7 +24,7 @@ def jsonapi(fn):
def to_json(request, *args, **kwargs):
context_data = fn(request, *args, **kwargs)
return HttpResponse(json.dumps(context_data),
mimetype='application/json')
content_type='application/json')
return to_json
def render(template, data, request):

2
ietf/secr/meetings/views.py
View file

@ -240,7 +240,7 @@ def ajax_get_times(request, meeting_id, day):
d = {'id': slot.time.strftime('%H%M'), 'value': '%s-%s' % (slot.time.strftime('%H%M'), slot.end_time().strftime('%H%M'))}
results.append(d)
return HttpResponse(json.dumps(results), mimetype='application/javascript')
return HttpResponse(json.dumps(results), content_type='application/javascript')
# --------------------------------------------------
# STANDARD VIEW FUNCTIONS
# --------------------------------------------------

2
ietf/wgcharter/views.py
View file

@ -724,4 +724,4 @@ def charter_with_milestones_txt(request, name, rev):
dict(charter_text=charter_text,
milestones=milestones),
context_instance=RequestContext(request),
mimetype="text/plain")
content_type="text/plain")

2
ietf/wginfo/milestones.py
View file

@ -396,4 +396,4 @@ def reset_charter_milestones(request, acronym):
def ajax_search_docs(request, acronym):
docs = Document.objects.filter(name__icontains=request.GET.get('q',''), type="draft").order_by('name').distinct()[:20]
return HttpResponse(json_doc_names(docs), mimetype='application/json')
return HttpResponse(json_doc_names(docs), content_type='application/json')

10
ietf/wginfo/views.py
View file

@ -92,7 +92,7 @@ def wg_summary_area(request):
return render_to_response('wginfo/1wg-summary.txt',
{ 'areas': areas },
mimetype='text/plain; charset=UTF-8')
content_type='text/plain; charset=UTF-8')
def wg_summary_acronym(request):
areas = Group.objects.filter(type="area", state="active").order_by("name")
@ -102,7 +102,7 @@ def wg_summary_acronym(request):
return render_to_response('wginfo/1wg-summary-by-acronym.txt',
{ 'areas': areas,
'groups': groups },
mimetype='text/plain; charset=UTF-8')
content_type='text/plain; charset=UTF-8')
def wg_charters(request):
areas = Group.objects.filter(type="area", state="active").order_by("name")
@ -114,7 +114,7 @@ def wg_charters(request):
group.area = area
return render_to_response('wginfo/1wg-charters.txt',
{ 'areas': areas },
mimetype='text/plain; charset=UTF-8')
content_type='text/plain; charset=UTF-8')
def wg_charters_by_acronym(request):
areas = dict((a.id, a) for a in Group.objects.filter(type="area", state="active").order_by("name"))
@ -128,7 +128,7 @@ def wg_charters_by_acronym(request):
group.area = areas.get(group.parent_id)
return render_to_response('wginfo/1wg-charters-by-acronym.txt',
{ 'groups': groups },
mimetype='text/plain; charset=UTF-8')
content_type='text/plain; charset=UTF-8')
def active_wgs(request):
areas = Group.objects.filter(type="area", state="active").order_by("name")
@ -258,7 +258,7 @@ def group_documents_txt(request, acronym):
rows.append(u"\t".join((d.prefix, name, clean_whitespace(d.title))))
return HttpResponse(u"\n".join(rows), mimetype='text/plain; charset=UTF-8')
return HttpResponse(u"\n".join(rows), content_type='text/plain; charset=UTF-8')
def group_charter(request, acronym):