Handle None tags and fields

aviau · aviau · commit 26683a4f22a1 · 2015-08-06T12:11:48.000-04:00
diff --git a/influxdb/line_protocol.py b/influxdb/line_protocol.py
@@ -47,9 +47,13 @@ def _escape_tag(tag):
 def _escape_value(value):
     value = _get_unicode(value)
     if isinstance(value, text_type) and value != '':
-        return "\"{}\"".format(value.replace(
-            "\"", "\\\""
-        ))
+        return "\"{}\"".format(
+            value.replace(
+                "\"", "\\\""
+            ).replace(
+                "\n", "\\n"
+            )
+        )
     else:
         return str(value)
 
@@ -60,6 +64,8 @@ def _get_unicode(data, force=False):
     """
     if isinstance(data, binary_type):
         return data.decode('utf-8')
+    elif data is None:
+        return ''
     elif force:
         return str(data)
     else:
@@ -102,10 +108,13 @@ def make_lines(data, precision=None):
         # add fields
         field_values = []
         for field_key in sorted(point['fields'].keys()):
-            field_values.append("{key}={value}".format(
-                key=_escape_tag(field_key),
-                value=_escape_value(point['fields'][field_key]),
-            ))
+            key = _escape_tag(field_key)
+            value = _escape_value(point['fields'][field_key])
+            if key != '' and value != '':
+                field_values.append("{key}={value}".format(
+                    key=key,
+                    value=value
+                ))
         field_values = ','.join(field_values)
         elements.append(field_values)
 
diff --git a/influxdb/tests/test_line_protocol.py b/influxdb/tests/test_line_protocol.py
@@ -10,6 +10,7 @@ def test_make_lines(self):
         data = {
             "tags": {
                 "empty_tag": "",
+                "none_tag": None,
                 "integer_tag": 2,
                 "string_tag": "hello"
             },
@@ -19,6 +20,7 @@ def test_make_lines(self):
                     "fields": {
                         "string_val": "hello!",
                         "int_val": 1,
+                        "none_field": None,
                     }
                 }
             ]
@@ -29,3 +31,20 @@ def test_make_lines(self):
             'test,integer_tag=2,string_tag=hello '
             'int_val=1,string_val="hello!"\n'
         )
+
+    def test_string_val_newline(self):
+        data = {
+            "points": [
+                {
+                    "measurement": "m1",
+                    "fields": {
+                        "multi_line": "line1\nline1\nline3"
+                    }
+                }
+            ]
+        }
+
+        self.assertEqual(
+            line_protocol.make_lines(data),
+            'm1 multi_line="line1\\nline1\\nline3"\n'
+        )
