Merge pull request #63 from Savier/ensure_ascii

add ensure_ascii parameter to propagate it to json.dumps

Author: madzak

src/pythonjsonlogger/jsonlogger.py

@@ -90,6 +90,8 @@ def __init__(self, *args, **kwargs):
             that will be used to customize the indent of the output json.
         :param prefix: an optional string prefix added at the beginning of
             the formatted string
+        :param json_indent: indent parameter for json.dumps
+        :param json_ensure_ascii: ensure_ascii parameter for json.dumps
         :param reserved_attrs: an optional list of fields that will be skipped when
             outputting json log record. Defaults to all log record attributes:
             http://docs.python.org/library/logging.html#logrecord-attributes
@@ -102,6 +104,7 @@ def __init__(self, *args, **kwargs):
         self.json_encoder = kwargs.pop("json_encoder", None)
         self.json_serializer = kwargs.pop("json_serializer", json.dumps)
         self.json_indent = kwargs.pop("json_indent", None)
+        self.json_ensure_ascii = kwargs.pop("json_ensure_ascii", True)
         self.prefix = kwargs.pop("prefix", "")
         reserved_attrs = kwargs.pop("reserved_attrs", RESERVED_ATTRS)
         self.reserved_attrs = dict(zip(reserved_attrs, reserved_attrs))
@@ -152,7 +155,8 @@ def jsonify_log_record(self, log_record):
         return self.json_serializer(log_record,
                                     default=self.json_default,
                                     cls=self.json_encoder,
-                                    indent=self.json_indent)
+                                    indent=self.json_indent,
+                                    ensure_ascii=self.json_ensure_ascii)
 
     def format(self, record):
         """Formats a log record and serializes to json"""

tests/tests.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import unittest
 import logging
 import json
@@ -173,6 +174,22 @@ def testExcInfo(self):
         logJson = json.loads(self.buffer.getvalue())
         self.assertEqual(logJson.get("exc_info"), expected_value)
 
+    def testEnsureAsciiTrue(self):
+        fr = jsonlogger.JsonFormatter()
+        self.logHandler.setFormatter(fr)
+        self.logger.info('Привет')
+        msg = self.buffer.getvalue().split('"message": "', 1)[1].split('"', 1)[0]
+        self.assertEqual(msg, r"\u041f\u0440\u0438\u0432\u0435\u0442")
+
+    def testEnsureAsciiFalse(self):
+        fr = jsonlogger.JsonFormatter(json_ensure_ascii=False)
+        self.logHandler.setFormatter(fr)
+        self.logger.info('Привет')
+        msg = self.buffer.getvalue().split('"message": "', 1)[1].split('"', 1)[0]
+        self.assertEqual(msg, "Привет")
+
+
+
 if __name__ == '__main__':
     if len(sys.argv[1:]) > 0:
         if sys.argv[1] == 'xml':