Merge pull request apache#9 from ASUS-AICS/fix_Null_become_None_string

Fix Null char becomes 'None' issue
whelan9453 · Mar 19, 2020 · bd92e0f · bd92e0f
2 parents 9b9dc8f + 75e99bc
commit bd92e0f
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/superset/views/core.py b/superset/views/core.py
@@ -2817,21 +2817,24 @@ def generate():
                     isHeader = False
                 else:
                     for item in row:
-                        # Remove extra commas
-                        item = str(item).replace(',', ' ')
-                        # Remove new lines in Windows
-                        if '\r\n' in item:
-                            item = item.replace('\r\n', ' ')
-                        # Remove new lines in Linux and new MacOS
-                        if '\n' in item:
-                            item = item.replace('\n', ' ')
-                        # Remove new lines in old MacOS
-                        if '\r' in item:
-                            item = item.replace('\r', ' ')
-                        # Escape double quotes
-                        if '"' in item:
-                            item = item.replace('"', '""')
-                        s += item + ','
+                        if item != None:
+                            # Remove extra commas
+                            item = str(item).replace(',', ' ')
+                            # Remove new lines in Windows
+                            if '\r\n' in item:
+                                item = item.replace('\r\n', ' ')
+                            # Remove new lines in Linux and new MacOS
+                            if '\n' in item:
+                                item = item.replace('\n', ' ')
+                            # Remove new lines in old MacOS
+                            if '\r' in item:
+                                item = item.replace('\r', ' ')
+                            # Escape double quotes
+                            if '"' in item:
+                                item = item.replace('"', '""')
+                            s += item + ','
+                        else:
+                            s += ','
                     s = s[:-1] + '\n'
                 yield s