[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 03/14] qapi: Use OrderedDict from standard librar
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v5 03/14] qapi: Use OrderedDict from standard library if available |
Date: |
Tue, 16 Jan 2018 13:42:06 +0000 |
The OrderedDict class appeared in the 'collections' module
from python 2.7 onwards, so use that in preference to our
local backport if available.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
scripts/qapi.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 98d7123d27..514b7bb5a4 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
- [Qemu-devel] [PATCH v5 00/14] Support building with py2 or py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 01/14] qapi: convert to use python print function instead of statement, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 02/14] qapi: use items()/values() intead of iteritems()/itervalues(), Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 03/14] qapi: Use OrderedDict from standard library if available,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v5 04/14] qapi: adapt to moved location of StringIO module in py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 05/14] qapi: Adapt to moved location of 'maketrans' function in py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 06/14] qapi: remove '-q' arg to diff when comparing QAPI output, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 07/14] qapi: ensure stable sort ordering when checking QAPI entities, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 10/14] configure: allow use of python 3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 09/14] scripts: ensure signrom treats data as bytes, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 08/14] qapi: force a UTF-8 locale for running Python, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 11/14] input: add missing JIS keys to virtio input, Daniel P. Berrange, 2018/01/16