From 48542c39a24a32c628dc4b59efa5545b2112ea57 Mon Sep 17 00:00:00 2001
From: Swapnil Negi <swapnil.negi09@gmail.com>
Date: Thu, 5 Apr 2018 04:59:16 +0530
Subject: modtool: Pylint error fixes
---
gr-utils/python/modtool/modtool_rm.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'gr-utils/python/modtool/modtool_rm.py')
diff --git a/gr-utils/python/modtool/modtool_rm.py b/gr-utils/python/modtool/modtool_rm.py
index d03e915ef9..3393942af0 100644
--- a/gr-utils/python/modtool/modtool_rm.py
+++ b/gr-utils/python/modtool/modtool_rm.py
@@ -62,15 +62,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:
@@ -112,8 +112,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',))
@@ -134,7 +134,7 @@ class ModToolRemove(ModTool):
for f in files:
if re.search(self._info['pattern'], os.path.basename(f)) is not None:
files_filt.append(f)
- if len(files_filt) == 0:
+ if not files_filt:
print "None found."
return []
# 2. Delete files, Makefile entries and other occurrences
--
cgit v1.2.3