bd7e079f56
Hopefully we're at least close to the right stuff for handling python2 vs python3 right with these changes. OBS-URL: https://build.opensuse.org/request/show/569754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=384
27 lines
907 B
Diff
27 lines
907 B
Diff
From 9bf5e7d570de8a98434e3c51d8e60fe6fab02f5c Mon Sep 17 00:00:00 2001
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
Date: Mon, 15 Jan 2018 17:40:16 -0700
|
|
Subject: [PATCH] qapi: Adapt to moved location of 'maketrans' function in py3
|
|
|
|
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 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.
|