All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Fam Zheng" <famz@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Eric Blake" <eblake@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available
Date: Mon, 15 Jan 2018 10:26:11 +0000	[thread overview]
Message-ID: <20180115102621.9183-4-berrange@redhat.com> (raw)
In-Reply-To: <20180115102621.9183-1-berrange@redhat.com>

The OrderedDict class appeared in the 'collections' module
from python 2.7 onwards, so use that in preference to our
local backport if available.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 scripts/qapi.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 5ef50317ca..7ec2e00b2c 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -18,7 +18,10 @@ import os
 import re
 import string
 import sys
-from ordereddict import OrderedDict
+try:
+    from collections import OrderedDict
+except:
+    from ordereddict import OrderedDict
 
 builtin_types = {
     'null':     'QTYPE_QNULL',
-- 
2.14.3

  parent reply	other threads:[~2018-01-15 10:26 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-15 10:26 [Qemu-devel] [PATCH v3 00/13] Support building with py2 or py3 Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 01/13] qapi: convert to use python print function instead of statement Daniel P. Berrange
2018-01-15 10:37   ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 02/13] qapi: use items()/values() intead of iteritems()/itervalues() Daniel P. Berrange
2018-01-15 10:38   ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` Daniel P. Berrange [this message]
2018-01-15 10:39   ` [Qemu-devel] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3 Daniel P. Berrange
2018-01-15 10:40   ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 05/13] qapi: Adapt to moved location of 'maketrans' function " Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 06/13] qapi: remove '-q' arg to diff when comparing QAPI output Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 07/13] qapi: ensure stable sort ordering when checking QAPI entities Daniel P. Berrange
2018-01-15 10:40   ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes Daniel P. Berrange
2018-01-15 10:41   ` Philippe Mathieu-Daudé
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 09/13] configure: allow use of python 3 Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 10/13] input: add missing JIS keys to virtio input Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 11/13] ui: update keycodemapdb to get py3 fixes Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 12/13] travis: improve python version test coverage Daniel P. Berrange
2018-01-15 10:26 ` [Qemu-devel] [PATCH v3 13/13] docker: change Fedora images to run with python3 Daniel P. Berrange
2018-01-15 10:47   ` Philippe Mathieu-Daudé
2018-01-15 10:53     ` Daniel P. Berrange
2018-01-15 13:06       ` Philippe Mathieu-Daudé
2018-01-15 11:07 ` [Qemu-devel] [PATCH v3 00/13] Support building with py2 or py3 no-reply

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=20180115102621.9183-4-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=famz@redhat.com \
    --cc=pbonzini@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.