From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com,
blauwirbel@gmail.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v4 13/26] qapi: ordereddict, add to_json() method
Date: Fri, 12 Oct 2012 16:10:55 -0500 [thread overview]
Message-ID: <1350076268-18461-14-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com>
This allows OrderedDict() instances to be [pretty-]printed to
QAPI-compatible JSON structures with field ordering preserved. This is
useful for QIDL, which generates schemas programatically and exposes
them to users in various ways.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
scripts/ordereddict.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/scripts/ordereddict.py b/scripts/ordereddict.py
index 7242b50..f1f8c71 100644
--- a/scripts/ordereddict.py
+++ b/scripts/ordereddict.py
@@ -23,6 +23,21 @@
from UserDict import DictMixin
class OrderedDict(dict, DictMixin):
+ class Indent(object):
+ def __init__(self, enable=True, initial_spacing=4, initial_level=0):
+ self.enable = enable
+ self.level = initial_level
+ self.spacing = initial_spacing
+ def inc(self, n=1):
+ self.level += n
+ return self.level
+ def dec(self, n=1):
+ self.level -= n
+ return self.level
+ def prefix(self):
+ if self.enable:
+ return " " * (self.spacing * self.level)
+ return ""
def __init__(self, *args, **kwds):
if len(args) > 1:
@@ -125,3 +140,39 @@ class OrderedDict(dict, DictMixin):
def __ne__(self, other):
return not self == other
+
+ def __obj_to_json(self, node, pretty=True, indent_spacing=4, indent_level=0):
+ i = self.Indent(pretty, indent_spacing, indent_level)
+ text = ""
+
+ if isinstance(node, OrderedDict):
+ if indent_level == 0:
+ text += "%s{\n" % i.prefix()
+ else:
+ text += "{\n"
+ i.inc()
+ for (k, v) in node.items():
+ text += "%s'%s': %s" % (i.prefix(), k,
+ self.__obj_to_json(v, pretty, i.spacing, i.level))
+ i.dec()
+ text += "%s}" % i.prefix()
+ elif isinstance(node, list):
+ text += "[\n"
+ i.inc()
+ for e in node:
+ text += "%s%s" % (i.prefix(),
+ self.__obj_to_json(e, pretty, i.spacing, i.level))
+ i.dec()
+ text += "%s]" % i.prefix()
+ else:
+ text += repr(node)
+
+ if indent_level > 0:
+ text += ",\n"
+
+ if not pretty:
+ return text.replace("\n", " ")
+ return text
+
+ def to_json(self, pretty=True, indent_spacing=4, indent_level=0):
+ return self.__obj_to_json(self)
--
1.7.9.5
next prev parent reply other threads:[~2012-10-12 21:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 21:10 [Qemu-devel] [PATCH v4 00/26] Add infrastructure for QIDL-based device serialization Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 01/26] qapi: qapi-visit.py -> qapi_visit.py so we can import Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 02/26] qapi: qapi-types.py -> qapi_types.py Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 03/26] qapi: qapi-commands.py -> qapi_commands.py Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 04/26] qapi: qapi_visit.py, make code useable as module Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 05/26] qapi: qapi_visit.py, support arrays and complex qapi definitions Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 06/26] qapi: qapi_visit.py, support generating static functions Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 07/26] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 08/26] qapi: add visitor interfaces for C arrays Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 09/26] qapi: QmpOutputVisitor, implement array handling Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 10/26] qapi: QmpInputVisitor, " Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 11/26] qapi: QmpInputVisitor, don't re-allocate memory in start_struct Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 12/26] qapi: fix potential segfault for visit_type_size() Michael Roth
2012-10-12 21:10 ` Michael Roth [this message]
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 14/26] qapi: qapi.py, make json parser more robust Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 15/26] qapi: add open-coded visitor for struct tm types Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 16/26] qapi: Improve existing docs and document annotated QAPI types Michael Roth
2012-10-12 21:10 ` [Qemu-devel] [PATCH v4 17/26] qom-fuse: force single-threaded mode to avoid QMP races Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 18/26] qom-fuse: workaround for truncated properties > 4096 Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 19/26] module additions for schema registration Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 20/26] qdev: move Property-related declarations to qdev-properties.h Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 21/26] qidl: add documentation Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 22/26] qidl: add lexer library (based on QC parser) Michael Roth
2012-10-16 7:26 ` Paolo Bonzini
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 23/26] qidl: add C parser " Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 24/26] qidl: add QAPI-based code generator Michael Roth
2012-10-15 8:12 ` Paolo Bonzini
2012-10-15 13:08 ` Paolo Bonzini
2012-10-15 16:35 ` Michael Roth
2012-10-15 19:37 ` Michael Roth
2012-10-16 7:20 ` Paolo Bonzini
2012-10-19 3:06 ` Michael Roth
2012-10-19 9:01 ` Paolo Bonzini
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 25/26] qidl: qidl.h, definitions for qidl annotations Michael Roth
2012-10-12 21:11 ` [Qemu-devel] [PATCH v4 26/26] qidl: unit tests and build infrastructure Michael Roth
2012-10-15 10:05 ` Paolo Bonzini
2012-10-15 16:37 ` Michael Roth
2012-10-16 7:21 ` Paolo Bonzini
2012-10-19 3:12 ` Michael Roth
2012-10-15 8:09 ` [Qemu-devel] [PATCH v4 00/26] Add infrastructure for QIDL-based device serialization Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350076268-18461-14-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).