mimetype is now called content_type

This commit is contained in:
Magnus Hagander
2016-04-28 11:33:57 +02:00
parent cd780de8b6
commit da812e682b
3 changed files with 8 additions and 8 deletions

View File

@ -121,7 +121,7 @@ def organisationform(request, itemid):
def robots(request):
if not is_behind_cache(request):
# If we're not serving this through one of our Varnish caches, we allow *nothing* to be indexed
return HttpResponse("User-agent: *\nDisallow: /\n", mimetype='text/plain')
return HttpResponse("User-agent: *\nDisallow: /\n", content_type='text/plain')
else:
# Regular website
return HttpResponse("""User-agent: *
@ -134,13 +134,13 @@ Disallow: /message-id/raw/
Disallow: /message-id/flat/
Sitemap: http://www.postgresql.org/sitemap.xml
""", mimetype='text/plain')
""", content_type='text/plain')
# Sitemap (XML format)
@cache(hours=6)
def sitemap(request):
resp = HttpResponse(mimetype='text/xml')
resp = HttpResponse(content_type='text/xml')
x = PgXmlHelper(resp)
x.startDocument()
x.startElement('urlset', {'xmlns': 'http://www.sitemaps.org/schemas/sitemap/0.9'})
@ -202,7 +202,7 @@ def dynamic_css(request, css):
header_mtime = parse_http_date(matches.group(1))
# We don't do length checking, just the date
if int(latestmod) <= header_mtime:
return HttpResponseNotModified(mimetype='text/css')
return HttpResponseNotModified(content_type='text/css')
resp['Last-Modified'] = http_date(latestmod)
for fn in files:
@ -245,7 +245,7 @@ def system_information_ssl(request):
@cache(seconds=30)
def sync_timestamp(request):
s = datetime.now().strftime("%Y-%m-%d %H:%M:%S\n")
r = HttpResponse(s, mimetype='text/plain')
r = HttpResponse(s, content_type='text/plain')
r['Content-Length'] = len(s)
return r

View File

@ -182,7 +182,7 @@ def mirrors_xml(request):
# Same as in mirrorselect
all_mirrors = Mirror.objects.filter(mirror_active=True, mirror_private=False, mirror_dns=True).extra(where=["mirror_last_rsync>(now() - '48 hours'::interval)"]).order_by('country_name', 'mirror_index')
resp = HttpResponse(mimetype='text/xml')
resp = HttpResponse(content_type='text/xml')
x = PgXmlHelper(resp)
x.startDocument()
x.startElement('mirrors', {})
@ -228,7 +228,7 @@ def productform(request, itemid):
def applications_v2_xml(request):
all_apps = StackBuilderApp.objects.select_related().filter(active=True)
resp = HttpResponse(mimetype='text/xml')
resp = HttpResponse(content_type='text/xml')
x = PgXmlHelper(resp, skipempty=True)
x.startDocument()
x.startElement('applications', {})

View File

@ -62,7 +62,7 @@ to the list maintainers and other members, and you may be automatically unsubscr
}, NavContext(request, "community"))
def listinfo(request):
resp = HttpResponse(mimetype='application/json')
resp = HttpResponse(content_type='application/json')
groupdata = [ {
'id': g.id,
'name': g.groupname,