Fix chimere_export command

2 files changed, 7 insertions, 7 deletions

diff --git a/chimere/admin.py b/chimere/admin.py
index d54986c..1295cf5 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -73,7 +73,7 @@ def export_to_kml(modeladmin, request, queryset):
     """
     filename, result = KMLManager.export(queryset)
     response = HttpResponse(result,
-                            mimetype='application/vnd.google-earth.kml+xml')
+                            content_type='application/vnd.google-earth.kml+xml')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
     return response
 export_to_kml.short_description = _("Export to KML")
@@ -99,7 +99,7 @@ def export_to_csv(modeladmin, request, queryset):
     Export data to CSV
     """
     filename, result = CSVManager.export(queryset)
-    response = HttpResponse(result, mimetype='text/csv')
+    response = HttpResponse(result, content_type='text/csv')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
     return response
 export_to_csv.short_description = _("Export to CSV")
diff --git a/chimere/management/commands/chimere_export.py b/chimere/management/commands/chimere_export.py
index 4e91956..09271cf 100644
--- a/chimere/management/commands/chimere_export.py
+++ b/chimere/management/commands/chimere_export.py
@@ -35,7 +35,7 @@ class Command(BaseCommand):
                     self.stdout.write(' %d - %s\n' % (subcat.pk, subcat.name))
             self.stdout.write('\nSub-category ID: ')
             self.stdout.flush()
-            v = raw_input()
+            v = input()
             try:
                 subcat = SubCategory.objects.get(pk=v)
             except (ValueError, ObjectDoesNotExist) as e:
@@ -51,7 +51,7 @@ class Command(BaseCommand):
             frmat = args[1]
         while frmat not in ('CSV', 'KML', 'SHP'):
             self.stdout.write('Choose a format (CSV, KML or SHP): ')
-            frmat = raw_input().replace('\n', '')
+            frmat = input().replace('\n', '')
         exporter = EXPORTER[frmat]
         cls = None
         if args and args[2]:
@@ -67,7 +67,7 @@ class Command(BaseCommand):
         while not cls:
             self.stdout.write('Choose an item type:\n 1 - marker\n 2 - route\n')
             self.stdout.write('Number: ')
-            v = raw_input()
+            v = input()
             if v == '1':
                 cls = Marker
             elif v == '2':
@@ -77,10 +77,10 @@ class Command(BaseCommand):
             filename = args[3]
         else:
             self.stdout.write('Filename: ')
-            filename = raw_input()
+            filename = input()
         response = exporter(None, None, cls.objects.filter(categories=subcat))
         try:
-            with open(filename, 'w+') as fl:
+            with open(filename, 'wb+') as fl:
                 fl.write(response.content)
         except IOError as e:
             raise CommandError(e)