diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-06-25 19:28:29 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-06-25 19:28:29 +0200 |
| commit | 03ae7938351f01313d30a41927ffb77670fcca14 (patch) | |
| tree | 586744f0e2b7560dc161f2a7a60030155d43ce8a /gr-utils/python/modtool/util_functions.py | |
| parent | d78f7fcd0dadd362fcdc99194da5343a506eb519 (diff) | |
| parent | c66aec4dfae559004e88da968d1ce57584e144ee (diff) | |
Merge branch 'next_python3' into next
This brings Python3 to `next`.
It also brings
* a bump in SWIG dependency version
* various GRC improvements,
* YAML instead of XML in GRC
* a lot of broken unit tests
Diffstat (limited to 'gr-utils/python/modtool/util_functions.py')
| -rw-r--r-- | gr-utils/python/modtool/util_functions.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gr-utils/python/modtool/util_functions.py b/gr-utils/python/modtool/util_functions.py index 59f8984ca3..6ba73d82ac 100644 --- a/gr-utils/python/modtool/util_functions.py +++ b/gr-utils/python/modtool/util_functions.py @@ -20,6 +20,8 @@ # """ Utility functions for gr_modtool """ +from __future__ import unicode_literals + import re import sys import readline @@ -73,7 +75,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. @@ -98,7 +100,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: @@ -132,7 +134,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 |