Support unicode in file_system_neo4j_csv_loader (#203)

* Support unicode in file_system_neo4j_csv_loader

* increment version

* Update

* Update

* Let Python3 use csv not unicodecsv

databuilder/loader/file_system_neo4j_csv_loader.py

-import csv
+import six
 import logging
 import os
 import shutil
@@ -14,6 +14,12 @@ from databuilder.models.neo4j_csv_serde import NODE_LABEL, \
 from databuilder.models.neo4j_csv_serde import Neo4jCsvSerializable  # noqa: F401
 from databuilder.utils.closer import Closer
 
+if six.PY2:
+    import unicodecsv as csv
+else:
+    import csv
+
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -168,8 +174,13 @@ class FsNeo4jCSVLoader(Loader):
             file_out.close()
         self._closer.register(file_out_close)
 
+        if six.PY2:
+            writer = csv.DictWriter(file_out, fieldnames=csv_record_dict.keys(),
+                                    quoting=csv.QUOTE_NONNUMERIC, encoding='utf-8')
+        else:
             writer = csv.DictWriter(file_out, fieldnames=csv_record_dict.keys(),
                                     quoting=csv.QUOTE_NONNUMERIC)
+
         writer.writeheader()
         file_mapping[key] = writer
 

requirements.txt

@@ -54,6 +54,7 @@ pytz==2018.4
 antlr4-python2-runtime==4.7.1
 statsd==3.2.1
 retrying==1.3.3
+unicodecsv==0.14.1,<1.0
 
 
 

setup.py

@@ -2,7 +2,7 @@ import os
 from setuptools import setup, find_packages
 
 
-__version__ = '2.0.2'
+__version__ = '2.0.3'
 
 
 requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt')