2018-02-22 23:01:24 +01:00
|
|
|
From 038a061ce8a984ae6de48ceb247033e7799a72fb Mon Sep 17 00:00:00 2001
|
2018-01-26 00:50:30 +01:00
|
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
2018-02-08 20:55:31 +01:00
|
|
|
Date: Tue, 16 Jan 2018 13:42:08 +0000
|
2018-01-26 00:50:30 +01:00
|
|
|
Subject: [PATCH] qapi: Adapt to moved location of 'maketrans' function in py3
|
|
|
|
|
|
2018-02-08 20:55:31 +01:00
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
2018-01-26 00:50:30 +01:00
|
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
2018-02-08 20:55:31 +01:00
|
|
|
Message-Id: <20180116134217.8725-6-berrange@redhat.com>
|
|
|
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
|
|
(cherry picked from commit 52c4272c6c916a53cde65b997e1a4e891c14dcef)
|
|
|
|
|
[BR: BSC#1077564]
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
2018-01-26 00:50:30 +01:00
|
|
|
---
|
|
|
|
|
scripts/qapi.py | 5 ++++-
|
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
|
|
|
index 7882ae77fb..88e854edec 100644
|
|
|
|
|
--- a/scripts/qapi.py
|
|
|
|
|
+++ b/scripts/qapi.py
|
|
|
|
|
@@ -1743,7 +1743,10 @@ def c_enum_const(type_name, const_name, prefix=None):
|
|
|
|
|
type_name = prefix
|
|
|
|
|
return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper()
|
|
|
|
|
|
|
|
|
|
-c_name_trans = string.maketrans('.-', '__')
|
|
|
|
|
+if hasattr(str, 'maketrans'):
|
|
|
|
|
+ c_name_trans = str.maketrans('.-', '__')
|
|
|
|
|
+else:
|
|
|
|
|
+ c_name_trans = string.maketrans('.-', '__')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Map @name to a valid C identifier.
|
