From 9e625c4821f4c63421b3d3747c0c4f358fef6c5f Mon Sep 17 00:00:00 2001
From: Douglas Anderson <danderson@ntia.doc.gov>
Date: Sun, 12 Feb 2017 15:52:19 -0800
Subject: python3: update non-GRC components to use python2 or python3
---
gr-utils/python/modtool/util_functions.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gr-utils/python/modtool/util_functions.py')
diff --git a/gr-utils/python/modtool/util_functions.py b/gr-utils/python/modtool/util_functions.py
index de7f3d29b6..6197da638a 100644
--- a/gr-utils/python/modtool/util_functions.py
+++ b/gr-utils/python/modtool/util_functions.py
@@ -19,6 +19,7 @@
# Boston, MA 02110-1301, USA.
#
""" Utility functions for gr_modtool """
+from __future__ import unicode_literals
import re
import sys
@@ -97,7 +98,7 @@ def get_modname():
regexp = r'(project\s*\(\s*|GR_REGISTER_COMPONENT\(")gr-(?P<modname>[a-zA-Z0-9-_]+)(\s*(CXX)?|" ENABLE)'
try:
modname = re.search(regexp, cmfile, flags=re.MULTILINE).group('modname').strip()
- if modname in modname_trans.keys():
+ if modname in list(modname_trans.keys()):
modname = modname_trans[modname]
return modname
except AttributeError:
@@ -131,7 +132,7 @@ def ask_yes_no(question, default):
""" Asks a binary question. Returns True for yes, False for no.
default is given as a boolean. """
question += {True: ' [Y/n] ', False: ' [y/N] '}[default]
- if raw_input(question).lower() != {True: 'n', False: 'y'}[default]:
+ if input(question).lower() != {True: 'n', False: 'y'}[default]:
return default
else:
return not default
--
cgit v1.2.3
From 9f7e39ee5141791f93dbc1c842b1d1a49e33b068 Mon Sep 17 00:00:00 2001
From: Swapnil Negi <swapnil.negi09@gmail.com>
Date: Sat, 19 May 2018 23:56:09 +0530
Subject: modtool: modify str.translate() for python3 compatibility
---
gr-utils/python/modtool/util_functions.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gr-utils/python/modtool/util_functions.py')
diff --git a/gr-utils/python/modtool/util_functions.py b/gr-utils/python/modtool/util_functions.py
index 6197da638a..bdf1d84164 100644
--- a/gr-utils/python/modtool/util_functions.py
+++ b/gr-utils/python/modtool/util_functions.py
@@ -19,6 +19,7 @@
# Boston, MA 02110-1301, USA.
#
""" Utility functions for gr_modtool """
+
from __future__ import unicode_literals
import re
@@ -73,7 +74,7 @@ def strip_arg_types(string):
string = strip_default_values(string)
return ", ".join(
[part.strip().split(' ')[-1] for part in string.split(',')]
- ).translate(None, '*&')
+ ).translate(str.maketrans('','','*&'))
def strip_arg_types_grc(string):
"""" Strip the argument types from a list of arguments for GRC make tag.
--
cgit v1.2.3