Support unicode for file system neo4j csv loader in py3 (amundsen-io#259

)

* Support unicode for file system neo4j csv loader in py3

* Revert "Support unicode for file system neo4j csv loader in py3"

This reverts commit 23f3ae91c434a86c6c65805b38dfc99e97adc0cd.

* Fix py3 loader unicode encoding issue

databuilder/databuilder/loader/file_system_neo4j_csv_loader.py

@@ -166,21 +166,23 @@ def _get_writer(self,
             return writer
 
         LOGGER.info('Creating file for {}'.format(key))
-        file_out = open('{}/{}.csv'.format(dir_path, file_suffix), 'w')
-
-        def file_out_close():
-            # type: () -> None
-            LOGGER.info('Closing file IO {}'.format(file_out))
-            file_out.close()
-        self._closer.register(file_out_close)
 
         if six.PY2:
+
+            file_out = open('{}/{}.csv'.format(dir_path, file_suffix), 'w')
             writer = csv.DictWriter(file_out, fieldnames=csv_record_dict.keys(),
                                     quoting=csv.QUOTE_NONNUMERIC, encoding='utf-8')
         else:
+            file_out = open('{}/{}.csv'.format(dir_path, file_suffix), 'w', encoding='utf8')
             writer = csv.DictWriter(file_out, fieldnames=csv_record_dict.keys(),
                                     quoting=csv.QUOTE_NONNUMERIC)
 
+        def file_out_close():
+            # type: () -> None
+            LOGGER.info('Closing file IO {}'.format(file_out))
+            file_out.close()
+        self._closer.register(file_out_close)
+
         writer.writeheader()
         file_mapping[key] = writer
 

databuilder/setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '2.5.11'
+__version__ = '2.5.12'
 
 requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt')
 with open(requirements_path) as requirements_file: