* fixed the csv output format problem in 'admin/account/userprofile/csv'

* added 'account/csv_unicode.py' to provide Unicode CSV I/O support
* used 'UnicodeWriter' in 'account/admin.py' userprofile_csv_view to generate csv format export

2 files changed, 109 insertions, 10 deletions

diff --git a/account/admin.py b/account/admin.py
index 39c1c5c..46498eb 100644
--- a/account/admin.py
+++ b/account/admin.py
@@ -8,7 +8,11 @@ from django.http import HttpResponse
 
 from account.models import UserProfile, UserFile
 
+from account.csv_unicode import UnicodeReader, UnicodeWriter
+
 import os
+import datetime
+import csv
 
 
 class UserProfileAdmin(admin.ModelAdmin):
@@ -218,24 +222,47 @@ class UserProfileAdmin(admin.ModelAdmin):
         userprofile_objs = UserProfile.objects.all()
         fieldnames = userprofile_objs[0].dump_fieldnames()
         fields = [k for k,v in fieldnames.items()]
+#        # header
+#        header = u''
+#        for k in fields:
+#            header += u'{0},'.format(fieldnames[k])
+#        header += '\n'
+#        # contents
+#        contents = u''
+#        for obj in userprofile_objs:
+#            data = obj.dump()
+#            cline = u''
+#            for k in fields:
+#                if k == 'attachments':
+#                    cline += u'{0},'.format('||'.join(data[k]))
+#                else:
+#                    cline += u'{0},'.format(data[k])
+#            cline += '\n'
+#            contents += cline
+#        return HttpResponse(header+contents, content_type='text/plain')
+        filename = '{0}-{1}.csv'.format('registration', datetime.date.today().strftime('%Y%m%d'))
+        response = HttpResponse(content_type='text/csv')
+        response['Content-Disposition'] = 'attachment; filename="{0}"'.format(filename)
+        # Python 2's csv module does not support unicode I/O
+        #writer = csv.writer(response)
+        writer = UnicodeWriter(response)
         # header
-        header = u''
+        header = []
         for k in fields:
-            header += u'{0},'.format(fieldnames[k])
-        header += '\n'
+            header.append(fieldnames[k])
+        writer.writerow(header)
         # contents
-        contents = u''
         for obj in userprofile_objs:
             data = obj.dump()
-            cline = u''
+            row = []
             for k in fields:
                 if k == 'attachments':
-                    cline += u'{0},'.format('||'.join(data[k]))
+                    row.append(';'.join(data[k]))
                 else:
-                    cline += u'{0},'.format(data[k])
-            cline += '\n'
-            contents += cline
-        return HttpResponse(header+contents, content_type='text/plain')
+                    row.append(unicode(data[k]))
+            writer.writerow(row)
+        #
+        return response
 
 
 ###
diff --git a/account/csv_unicode.py b/account/csv_unicode.py
new file mode 100644
index 0000000..5cc7f4e
--- /dev/null
+++ b/account/csv_unicode.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+#
+# Python 2's csv module does not support Unicode input and output.
+# Use the UnicodeReader and UnicodeWriter class to provide
+# unicode csv i/o in django.
+#
+# Ref:
+# https://docs.djangoproject.com/en/dev/howto/outputting-csv/
+# https://docs.python.org/2/library/csv.html
+#
+
+import csv, codecs, cStringIO
+
+class UTF8Recoder:
+    """
+    Iterator that reads an encoded stream and reencodes the input to UTF-8
+    """
+    def __init__(self, f, encoding):
+        self.reader = codecs.getreader(encoding)(f)
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        return self.reader.next().encode('utf-8')
+
+class UnicodeReader:
+    """
+    A CSV reader which will iterate over lines in the CSV file "f",
+    which is encoded in the given encoding.
+    """
+
+    def __init__(self, f, dialect='excel', encoding='utf-8', **kwargs):
+        f = UTF8Recoder(f, encoding)
+        self.reader = csv.reader(f, dialect=dialect, **kwargs)
+
+    def next(self):
+        row = self.reader.next()
+        return [unicode(s, 'utf-8') for s in row]
+
+    def __iter__(self):
+        return self
+
+class UnicodeWriter:
+    """
+    A CSV writer which will write rows to CSV file "f",
+    which is encoded in the given encoding.
+    """
+
+    def __init__(self, f, dialect='excel', encoding='utf-8', **kwargs):
+        # Redirect output to a queue
+        self.queue = cStringIO.StringIO()
+        self.writer = csv.writer(self.queue, dialect=dialect, **kwargs)
+        self.stream = f
+        self.encoder = codecs.getincrementalencoder(encoding)()
+
+    def writerow(self, row):
+        self.writer.writerow([s.encode('utf-8') for s in row])
+        # Fetch UTF-8 output from the queue ...
+        data = self.queue.getvalue()
+        data = data.decode('utf-8')
+        # ... and reencode it into the target encoding
+        data = self.encoder.encode(data)
+        # write to the target stream
+        self.stream.write(data)
+        # empty queue
+        self.queue.truncate(0)
+
+    def writerows(self, rows):
+        for row in rows:
+            self.writerow(row)
+