qapi: Use OrderedDict from standard library if available

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é <[email protected]>
Signed-off-by: Daniel P. Berrange <[email protected]>
Message-Id: <20180116134217[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 98d7123d27260a53b02ec5b28697632d8fb8afa5..514b7bb5a48d44d664a95e8fbe74d038ae62a24e 100644 (file)
--- 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',