From 02141fb152addda9835956ab84287c559e297371 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 5 Nov 2009 13:31:21 +0100
Subject: [PATCH] Cache JSON encoders and sort keys
The sort_keys argument is supported since simplejson 1.3.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/serializer.py | 16 +++++-----------
test/ganeti.serializer_unittest.py | 19 ++++++++++++++-----
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/lib/serializer.py b/lib/serializer.py
index 2b78efd60..43dfaa7f3 100644
--- a/lib/serializer.py
+++ b/lib/serializer.py
@@ -42,7 +42,7 @@ _JSON_INDENT = 2
_RE_EOLSP = re.compile('[ \t]+$', re.MULTILINE)
-def _GetJsonDumpers():
+def _GetJsonDumpers(_encoder_class=simplejson.JSONEncoder):
"""Returns two JSON functions to serialize data.
@rtype: (callable, callable)
@@ -50,22 +50,16 @@ def _GetJsonDumpers():
generate a more readable, indented form of JSON (if supported)
"""
- plain_dump = simplejson.dumps
+ plain_encoder = _encoder_class(sort_keys=True)
# Check whether the simplejson module supports indentation
try:
- simplejson.dumps(1, indent=_JSON_INDENT)
+ indent_encoder = _encoder_class(indent=_JSON_INDENT, sort_keys=True)
except TypeError:
# Indentation not supported
- indent_dump = plain_dump
- else:
- # Indentation supported
- indent_dump = lambda data: simplejson.dumps(data, indent=_JSON_INDENT)
-
- assert callable(plain_dump)
- assert callable(indent_dump)
+ indent_encoder = plain_encoder
- return (plain_dump, indent_dump)
+ return (plain_encoder.encode, indent_encoder.encode)
(_DumpJson, _DumpJsonIndent) = _GetJsonDumpers()
diff --git a/test/ganeti.serializer_unittest.py b/test/ganeti.serializer_unittest.py
index cb275d53f..62d3b4672 100755
--- a/test/ganeti.serializer_unittest.py
+++ b/test/ganeti.serializer_unittest.py
@@ -52,15 +52,24 @@ class TestSerializer(testutils.GanetiTestCase):
]
def _TestSerializer(self, dump_fn, load_fn):
- for data in self._TESTDATA:
- self.failUnless(dump_fn(data).endswith("\n"))
- self.assertEqualValues(load_fn(dump_fn(data)), data)
+ for indent in [True, False]:
+ for data in self._TESTDATA:
+ self.failUnless(dump_fn(data, indent=indent).endswith("\n"))
+ self.assertEqualValues(load_fn(dump_fn(data, indent=indent)), data)
def testGeneric(self):
- return self._TestSerializer(serializer.Dump, serializer.Load)
+ self._TestSerializer(serializer.Dump, serializer.Load)
def testJson(self):
- return self._TestSerializer(serializer.DumpJson, serializer.LoadJson)
+ self._TestSerializer(serializer.DumpJson, serializer.LoadJson)
+
+ def testJsonIndent(self):
+ data = {
+ "k1": 1,
+ "k2": 3,
+ "k3": 4,
+ }
+ self.assert_(len(serializer.DumpJson(data, indent=True).splitlines()) > 3)
def testSignedMessage(self):
LoadSigned = serializer.LoadSigned
--
GitLab