Merge pull request influxdata#296 from anonymouzz/master

aviau · aviau · commit e242c309c4c9 · 2016-02-19T09:53:05.000-05:00
Fix unicode data handling in tag's content (Thanks @anonymouzz !)
diff --git a/influxdb/line_protocol.py b/influxdb/line_protocol.py
@@ -7,7 +7,7 @@
 from numbers import Integral
 
 from dateutil.parser import parse
-from six import binary_type, text_type, integer_types
+from six import binary_type, text_type, integer_types, PY2
 
 
 def _convert_timestamp(timestamp, precision=None):
@@ -74,7 +74,10 @@ def _get_unicode(data, force=False):
     elif data is None:
         return ''
     elif force:
-        return str(data)
+        if PY2:
+            return unicode(data)
+        else:
+            return str(data)
     else:
         return data
 
diff --git a/influxdb/tests/test_line_protocol.py b/influxdb/tests/test_line_protocol.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 import sys
 if sys.version_info < (2, 7):
@@ -55,3 +56,23 @@ def test_string_val_newline(self):
             line_protocol.make_lines(data),
             'm1 multi_line="line1\\nline1\\nline3"\n'
         )
+
+    def test_make_lines_unicode(self):
+        data = {
+            "tags": {
+                "unicode_tag": "\'Привет!\'"  # Hello! in Russian
+            },
+            "points": [
+                {
+                    "measurement": "test",
+                    "fields": {
+                        "unicode_val": "Привет!",  # Hello! in Russian
+                    }
+                }
+            ]
+        }
+
+        self.assertEqual(
+            line_protocol.make_lines(data),
+            'test,unicode_tag=\'Привет!\' unicode_val="Привет!"\n'
+        )
