diff options
Diffstat (limited to 'gr-utils/python/modtool/modtool_rm.py')
| -rw-r--r-- | gr-utils/python/modtool/modtool_rm.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gr-utils/python/modtool/modtool_rm.py b/gr-utils/python/modtool/modtool_rm.py index b503fa2bf3..7395c99bea 100644 --- a/gr-utils/python/modtool/modtool_rm.py +++ b/gr-utils/python/modtool/modtool_rm.py @@ -52,9 +52,10 @@ class ModToolRemove(ModTool): if options.blockname is not None: self._info['pattern'] = options.blockname else: - with SequenceCompleter(): + block_candidates = self.get_block_candidates() + with SequenceCompleter(block_candidates): self._info['pattern'] = input('Which blocks do you want to delete? (Regex): ') - if len(self._info['pattern']) == 0: + if not self._info['pattern'] or self._info['pattern'].isspace(): self._info['pattern'] = '.' def run(self, options): @@ -68,15 +69,15 @@ class ModToolRemove(ModTool): (base, ext) = os.path.splitext(filename) if ext == '.h': remove_pattern_from_file(self._file['qalib'], - '^#include "%s"\s*$' % filename) + r'^#include "%s"\s*$' % filename) remove_pattern_from_file(self._file['qalib'], - '^\s*s->addTest\(gr::%s::%s::suite\(\)\);\s*$' % ( - self._info['modname'], base) + r'^\s*s->addTest\(gr::%s::%s::suite\(\)\);\s*$' % ( + self._info['modname'], base) ) self.scm.mark_file_updated(self._file['qalib']) elif ext == '.cc': ed.remove_value('list', - '\$\{CMAKE_CURRENT_SOURCE_DIR\}/%s' % filename, + r'\$\{CMAKE_CURRENT_SOURCE_DIR\}/%s' % filename, to_ignore_start='APPEND test_%s_sources' % self._info['modname']) self.scm.mark_file_updated(ed.filename) else: @@ -119,8 +120,8 @@ class ModToolRemove(ModTool): py_files_deleted = self._run_subdir('python', ('*.py',), ('GR_PYTHON_INSTALL',), cmakeedit_func=_remove_py_test_case) for f in py_files_deleted: - remove_pattern_from_file(self._file['pyinit'], '.*import\s+%s.*' % f[:-3]) - remove_pattern_from_file(self._file['pyinit'], '.*from\s+%s\s+import.*\n' % f[:-3]) + remove_pattern_from_file(self._file['pyinit'], r'.*import\s+%s.*' % f[:-3]) + remove_pattern_from_file(self._file['pyinit'], r'.*from\s+%s\s+import.*\n' % f[:-3]) if not self._skip_subdirs['grc']: self._run_subdir('grc', ('*.xml',), ('install',)) |