Django 1.8: HttpResponse mimetype -> content_type

8 files changed, 67 insertions, 67 deletions

diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index cf3a13b3b..1f5b46f63 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -43,9 +43,9 @@ def autocomplete_contextrecord(request):
         and not request.user.has_perm(
             'archaeological_context_records.view_own_contextrecord',
             models.ArchaeologicalSite)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     if request.GET.get('operation__pk'):
@@ -62,7 +62,7 @@ def autocomplete_contextrecord(request):
     data = json.dumps([{'id': item.pk,
                         'value': unicode(item)[:60]}
                        for item in items])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 get_contextrecord = get_item(
     models.ContextRecord,
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 0b05ad37d..d21e5801c 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -51,9 +51,9 @@ def autocomplete_file(request):
        not request.user.has_perm('ishtar_common.view_own_file', models.File) \
        and not request.user.ishtaruser.has_right('file_search',
                                                  session=request.session):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -74,7 +74,7 @@ def autocomplete_file(request):
     files = models.File.objects.filter(query)[:limit]
     data = json.dumps([{'id': file.pk, 'value': unicode(file)}
                        for file in files])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 get_file = get_item(models.File, 'get_file', 'file')
 revert_file = revert_item(models.File)
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 680faf421..681296b3c 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -84,9 +84,9 @@ def autocomplete_treatmentfile(request):
                                       models.Treatment) \
             and not request.user.ishtaruser.has_right('treatmentfile_search',
                                                       session=request.session):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q1 in q.split(' '):
@@ -104,7 +104,7 @@ def autocomplete_treatmentfile(request):
     files = models.TreatmentFile.objects.filter(query)[:limit]
     data = json.dumps([{'id': file.pk, 'value': unicode(file)}
                        for file in files])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 show_findsource = show_item(models.FindSource, 'findsource')
 
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 9b420f594..d3f239bbd 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -43,9 +43,9 @@ def autocomplete_patriarche(request, non_closed=True):
                                           models.Operation)
             and not request.user.ishtaruser.has_right(
                 'operation_search', session=request.session)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -58,7 +58,7 @@ def autocomplete_patriarche(request, non_closed=True):
     data = json.dumps([{'id': operation.code_patriarche,
                         'value': operation.code_patriarche}
                        for operation in operations])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_archaeologicalsite(request):
@@ -68,9 +68,9 @@ def autocomplete_archaeologicalsite(request):
         and not request.user.has_perm(
             'archaeological_operations.view_own_archaeologicalsite',
             models.ArchaeologicalSite)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -82,7 +82,7 @@ def autocomplete_archaeologicalsite(request):
     data = json.dumps([{'id': site.pk,
                         'value': unicode(site)[:60]}
                        for site in sites])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 new_archaeologicalsite = new_item(models.ArchaeologicalSite,
                                   ArchaeologicalSiteForm, many=True)
@@ -96,9 +96,9 @@ def autocomplete_operation(request, non_closed=True):
             'ishtar_common.view_own_operation', models.Operation)
             and not request.user.ishtaruser.has_right(
                 'operation_search', session=request.session)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -123,7 +123,7 @@ def autocomplete_operation(request, non_closed=True):
     operations = models.Operation.objects.filter(query)[:limit]
     data = json.dumps([{'id': operation.pk, 'value': unicode(operation)}
                        for operation in operations])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def get_available_operation_code(request, year=None):
@@ -131,10 +131,10 @@ def get_available_operation_code(request, year=None):
         'ishtar_common.view_operation', models.Operation)\
         and not request.user.has_perm(
             'ishtar_common.view_own_operation', models.Operation):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     data = json.dumps({'id':
                        models.Operation.get_available_operation_code(year)})
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 get_operation = get_item(models.Operation, 'get_operation', 'operation')
 
@@ -407,7 +407,7 @@ def generatedoc_administrativeactop(request, pk, template_pk=None):
             'ishtar_common.view_operation', models.Operation)
         and not request.user.has_perm(
             'ishtar_common.view_own_operation', models.Operation)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     try:
         act_file = models.AdministrativeAct.objects.get(pk=pk)
         doc = act_file.publish(template_pk)
@@ -421,11 +421,11 @@ def generatedoc_administrativeactop(request, pk, template_pk=None):
         mimetype = 'text/csv'
         if ext in MIMES:
             mimetype = MIMES[ext]
-        response = HttpResponse(open(doc), mimetype=mimetype)
+        response = HttpResponse(open(doc), content_type=mimetype)
         response['Content-Disposition'] = 'attachment; filename=%s' % \
             doc_name
         return response
-    return HttpResponse(mimetype='text/plain')
+    return HttpResponse(content_type='text/plain')
 
 
 def administrativeactfile_document(
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 677539a3f..60d31c09d 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -48,9 +48,9 @@ def autocomplete_warehouse(request):
                                  models.Warehouse)\
        and not request.user.has_perm(
             'ishtar_common.view_own_warehouse', models.Warehouse):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -61,7 +61,7 @@ def autocomplete_warehouse(request):
     warehouses = models.Warehouse.objects.filter(query)[:limit]
     data = json.dumps([{'id': warehouse.pk, 'value': unicode(warehouse)}
                        for warehouse in warehouses])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_container(request):
@@ -69,9 +69,9 @@ def autocomplete_container(request):
                                  models.Warehouse)\
        and not request.user.has_perm(
             'ishtar_common.view_own_warehouse', models.Warehouse):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -85,7 +85,7 @@ def autocomplete_container(request):
     containers = models.Container.objects.filter(query)[:limit]
     data = json.dumps([{'id': container.pk, 'value': unicode(container)}
                        for container in containers])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 warehouse_packaging_wizard = PackagingWizard.as_view([
     ('seleccontainer-packaging', ContainerFormSelection),
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index cdff25439..31cf87699 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -97,7 +97,7 @@ def export_as_csv_action(description=_(u"Export selected as CSV file"),
             excludeset = set(exclude)
             field_names = field_names - excludeset
 
-        response = HttpResponse(mimetype='text/csv')
+        response = HttpResponse(content_type='text/csv')
         response['Content-Disposition'] = 'attachment; filename=%s.csv' % \
             unicode(opts).replace('.', '_')
 
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index ecae18c5e..00f39e625 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2017 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -159,7 +159,7 @@ class FormSet(BaseFormSet):
 class TableSelect(forms.Form):
     def __init__(self, *args, **kwargs):
         super(TableSelect, self).__init__(*args, **kwargs)
-        key = self.fields.keyOrder[0]
+        key = self.fields.keys()[0]
         self.fields[key].widget.attrs['autofocus'] = 'autofocus'
 
     def get_input_ids(self):
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 316e3e9d5..009b7e3de 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -210,44 +210,44 @@ def get_autocomplete_generic(model, extra={'available': True}):
             else unicode(x)
         data = json.dumps([{'id': obj.pk, 'value': get_label(obj)}
                            for obj in objects])
-        return HttpResponse(data, mimetype='text/plain')
+        return HttpResponse(data, content_type='text/plain')
     return func
 
 
 def hide_shortcut_menu(request):
     request.session['SHORTCUT_SHOW'] = 'off'
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def show_shortcut_menu(request):
     request.session['SHORTCUT_SHOW'] = 'on'
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def activate_all_search(request):
     request.session['SHORTCUT_SEARCH'] = 'all'
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def activate_own_search(request):
     request.session['SHORTCUT_SEARCH'] = 'own'
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def activate_advanced_shortcut_menu(request):
     if not hasattr(request.user, 'ishtaruser'):
-        return HttpResponse('KO', mimetype='text/plain')
+        return HttpResponse('KO', content_type='text/plain')
     request.user.ishtaruser.advanced_shortcut_menu = True
     request.user.ishtaruser.save()
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def activate_simple_shortcut_menu(request):
     if not hasattr(request.user, 'ishtaruser'):
-        return HttpResponse('KO', mimetype='text/plain')
+        return HttpResponse('KO', content_type='text/plain')
     request.user.ishtaruser.advanced_shortcut_menu = False
     request.user.ishtaruser.save()
-    return HttpResponse('OK', mimetype='text/plain')
+    return HttpResponse('OK', content_type='text/plain')
 
 
 def shortcut_menu(request):
@@ -458,7 +458,7 @@ def autocomplete_person(request, person_types=None, attached_to=None,
         own_items = request.user.has_perm('ishtar_common.view_own_person',
                                           models.Person)
     if not all_items and not own_items or not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     limit = request.GET.get('limit', 20)
     try:
@@ -489,12 +489,12 @@ def autocomplete_person(request, person_types=None, attached_to=None,
     persons = models.Person.objects.filter(query)[:limit]
     data = json.dumps([{'id': person.pk, 'value': unicode(person)}
                        for person in persons if person])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_department(request):
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     q = unicodedata.normalize("NFKD", q).encode('ascii', 'ignore')
     query = Q()
@@ -505,12 +505,12 @@ def autocomplete_department(request):
     departments = models.Department.objects.filter(query)[:limit]
     data = json.dumps([{'id': department.pk, 'value': unicode(department)}
                        for department in departments])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_town(request):
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     q = unicodedata.normalize("NFKD", q).encode('ascii', 'ignore')
     query = Q()
@@ -523,12 +523,12 @@ def autocomplete_town(request):
     towns = models.Town.objects.filter(query)[:limit]
     data = json.dumps([{'id': town.pk, 'value': unicode(town)}
                        for town in towns])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_advanced_town(request, department_id=None, state_id=None):
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     q = unicodedata.normalize("NFKD", q).encode('ascii', 'ignore')
     query = Q()
@@ -552,7 +552,7 @@ def autocomplete_advanced_town(request, department_id=None, state_id=None):
             val += " (%s)" % town.numero_insee
         result.append({'id': town.pk, 'value': val})
     data = json.dumps(result)
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def department_by_state(request, state_id=''):
@@ -563,7 +563,7 @@ def department_by_state(request, state_id=''):
         data = json.dumps([{'id': department.pk, 'number': department.number,
                             'value': unicode(department)}
                            for department in departments])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def format_val(val):
@@ -603,7 +603,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
         allowed, own = models.check_model_access_control(request, model,
                                                          available_perms)
         if not allowed:
-            return HttpResponse(EMPTY, mimetype='text/plain')
+            return HttpResponse(EMPTY, content_type='text/plain')
 
         if force_own:
             own = True
@@ -679,7 +679,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
         try:
             old = 'old' in request_items and int(request_items['old'])
         except ValueError:
-            return HttpResponse('[]', mimetype='text/plain')
+            return HttpResponse('[]', content_type='text/plain')
 
         # manage relations types
         if 'relation_types' not in my_relation_types_prefix:
@@ -1107,9 +1107,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     "page": page_nb,
                     "total": (items_nb / row_nb + 1) if row_nb else items_nb,
                 })
-            return HttpResponse(data, mimetype='text/plain')
+            return HttpResponse(data, content_type='text/plain')
         elif data_type == "csv":
-            response = HttpResponse(mimetype='text/csv')
+            response = HttpResponse(content_type='text/csv')
             n = datetime.datetime.now()
             filename = u'%s_%s.csv' % (default_name,
                                        n.strftime('%Y%m%d-%H%M%S'))
@@ -1157,7 +1157,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     row.append(val)
                 writer.writerow(row)
             return response
-        return HttpResponse('{}', mimetype='text/plain')
+        return HttpResponse('{}', content_type='text/plain')
 
     return func
 
@@ -1169,7 +1169,7 @@ def get_by_importer(request, slug, data_type='json', full=False,
         res = ''
         if data_type == "json":
             res = '{}'
-        return HttpResponse(res, mimetype='text/plain')
+        return HttpResponse(res, content_type='text/plain')
     imp = q.all()[0].get_importer_class()
     cols, col_names = [], []
     for formater in imp.LINE_FORMAT:
@@ -1227,7 +1227,7 @@ def show_item(model, name, extra_dct=None):
                     item = item.get_previous(date=date)
                     assert item is not None
                 except (ValueError, AssertionError):
-                    return HttpResponse(None, mimetype='text/plain')
+                    return HttpResponse(None, content_type='text/plain')
                 dct['previous'] = item._previous
                 dct['next'] = item._next
             else:
@@ -1282,7 +1282,7 @@ def show_item(model, name, extra_dct=None):
             except xhtml2odt.ODTExportError:
                 return HttpResponse(content, content_type="application/xhtml")
             response = HttpResponse(
-                mimetype='application/vnd.oasis.opendocument.text')
+                content_type='application/vnd.oasis.opendocument.text')
             response['Content-Disposition'] = 'attachment; filename=%s.odt' % \
                                               filename
             response.write(odtfile)
@@ -1297,7 +1297,7 @@ def show_item(model, name, extra_dct=None):
             pdf = pisa.pisaDocument(StringIO.StringIO(html), result,
                                     encoding='utf-8')
             response = HttpResponse(result.getvalue(),
-                                    mimetype='application/pdf')
+                                    content_type='application/pdf')
             response['Content-Disposition'] = 'attachment; filename=%s.pdf' % \
                                               filename
             if not pdf.err:
@@ -1317,8 +1317,8 @@ def revert_item(model):
             date = datetime.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S.%f')
             item.rollback(date)
         except (ObjectDoesNotExist, ValueError, HistoryError):
-            return HttpResponse(None, mimetype='text/plain')
-        return HttpResponse("True", mimetype='text/plain')
+            return HttpResponse(None, content_type='text/plain')
+        return HttpResponse("True", content_type='text/plain')
     return func
 
 
@@ -1329,9 +1329,9 @@ def autocomplete_organization(request, orga_type=None):
                                   models.Organization)
        and not request.user.ishtaruser.has_right(
             'person_search', session=request.session)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -1348,16 +1348,16 @@ def autocomplete_organization(request, orga_type=None):
     organizations = models.Organization.objects.filter(query)[:limit]
     data = json.dumps([{'id': org.pk, 'value': unicode(org)}
                        for org in organizations])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def autocomplete_author(request):
     if not request.user.has_perm('ishtar_common.view_author', models.Author)\
        and not request.user.has_perm('ishtar_common.view_own_author',
                                      models.Author):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse(content_type='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -1370,7 +1370,7 @@ def autocomplete_author(request):
     authors = models.Author.objects.filter(query)[:limit]
     data = json.dumps([{'id': author.pk, 'value': unicode(author)}
                        for author in authors])
-    return HttpResponse(data, mimetype='text/plain')
+    return HttpResponse(data, content_type='text/plain')
 
 
 def new_item(model, frm, many=False):