diff options
Diffstat (limited to 'ishtar/furnitures/views.py')
| -rw-r--r-- | ishtar/furnitures/views.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py index d7edbf782..432724498 100644 --- a/ishtar/furnitures/views.py +++ b/ishtar/furnitures/views.py @@ -25,8 +25,6 @@ import csv import json import datetime -CSV_OPTIONS = {'delimiter':';', 'quotechar':'"', 'quoting':csv.QUOTE_ALL} - from django.http import HttpResponse from django.template import RequestContext from django.shortcuts import render_to_response, redirect @@ -40,6 +38,9 @@ from menus import menu import forms as ishtar_forms import models +CSV_OPTIONS = {'delimiter':';', 'quotechar':'"', 'quoting':csv.QUOTE_ALL} +ENCODING = settings.ENCODING or 'utf-8' + def index(request): """ Main page @@ -199,12 +200,12 @@ def get_item(model, func_name, default_name): try: field = model._meta.get_field(field_name) except: - col_names.append(u"".encode('utf-8')) + col_names.append(u"".encode(ENCODING)) continue - col_names.append(unicode(field.verbose_name).encode('utf-8')) + col_names.append(unicode(field.verbose_name).encode(ENCODING)) writer.writerow(col_names) for data in datas: - writer.writerow([val.encode('utf-8') for val in data[1:]]) + writer.writerow([val.encode(ENCODING) for val in data[1:]]) return response return HttpResponse(None, mimetype='text/plain') |