Merge branch 'release/1.0.4'

export/serializers/csv_serializer.py

@@ -205,14 +205,17 @@ def __iter__(self):
 
 class UnicodeWriter(object):
     """
-    A CSV writer which will write rows to CSV file "f",
-    which is encoded in the given encoding.
+    A CSV writer which will write rows to CSV file "f", which is encoded in
+    the given encoding.
     """
 
-    def __init__(self, f, dialect=csv.excel, encoding='utf-8', **kwds):
+    def __init__(self, f, dialect=csv.excel, encoding='utf-8',
+                 quoting=csv.QUOTE_ALL, **kwds):
         # Redirect output to a queue
         self.queue = StringIO.StringIO()
-        self.writer = csv.writer(self.queue, dialect=dialect, **kwds)
+        self.writer = csv.writer(
+            self.queue, dialect=dialect, quoting=quoting, **kwds
+        )
         self.stream = f
         self.encoder = codecs.getincrementalencoder(encoding)()
 

export/templates/export/export_form.html

@@ -12,6 +12,3 @@
         </div>
     </form>
 {% endblock %}
-
-
-file:///Users/jonathanb/Projects/Kagiso/ZAlebs/eggs/jmbo-1.0.14-py2.7.egg/jmbo/templates/admin

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='django-export',
-    version='1.0.3',
+    version='1.0.4',
     description='Django app allowing for filtered exporting of model data.',
     long_description=open('README.rst', 'r').read() + open('AUTHORS.rst', 'r').read() + open('CHANGELOG.rst', 'r').read(),
     author='Praekelt Foundation',