Merge d4d1f3f into cfec19a

elastic · Oct 24, 2017 · 7019861 · 7019861
2 parents cfec19a + d4d1f3f
commit 7019861
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/elasticsearch/serializer.py b/elasticsearch/serializer.py
@@ -45,7 +45,12 @@ def dumps(self, data):
             return data
 
         try:
-            return json.dumps(data, default=self.default, ensure_ascii=False)
+            return json.dumps(
+                data,
+                default=self.default,
+                ensure_ascii=False,
+                separators=(',', ':'),
+            )
         except (ValueError, TypeError) as e:
             raise SerializationError(data, e)
 

diff --git a/test_elasticsearch/test_serializer.py b/test_elasticsearch/test_serializer.py
@@ -12,15 +12,15 @@
 
 class TestJSONSerializer(TestCase):
     def test_datetime_serialization(self):
-        self.assertEquals('{"d": "2010-10-01T02:30:00"}', JSONSerializer().dumps({'d': datetime(2010, 10, 1, 2, 30)}))
+        self.assertEquals('{"d":"2010-10-01T02:30:00"}', JSONSerializer().dumps({'d': datetime(2010, 10, 1, 2, 30)}))
 
     def test_decimal_serialization(self):
         if sys.version_info[:2] == (2, 6):
             raise SkipTest("Float rounding is broken in 2.6.")
-        self.assertEquals('{"d": 3.8}', JSONSerializer().dumps({'d': Decimal('3.8')}))
+        self.assertEquals('{"d":3.8}', JSONSerializer().dumps({'d': Decimal('3.8')}))
 
     def test_uuid_serialization(self):
-        self.assertEquals('{"d": "00000000-0000-0000-0000-000000000003"}', JSONSerializer().dumps({'d': uuid.UUID('00000000-0000-0000-0000-000000000003')}))
+        self.assertEquals('{"d":"00000000-0000-0000-0000-000000000003"}', JSONSerializer().dumps({'d': uuid.UUID('00000000-0000-0000-0000-000000000003')}))
 
     def test_raises_serialization_error_on_dump_error(self):
         self.assertRaises(SerializationError, JSONSerializer().dumps, object())