Skip to content

tools: make mkssldef.py Python 3 compatible #25584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thefourtheye wants to merge 2 commits into from
Closed

tools: make mkssldef.py Python 3 compatible #25584

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
725fc96
tools: make mkssldef.py Python 3 compatible
thefourtheye Jan 19, 2019
4f75443
replace list comprehension with a generator
thefourtheye Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
tools: make mkssldef.py Python 3 compatible 
This patch replaces the usage of `map` in such a way that it will be
compatible with Python 3.
  • Loading branch information
@thefourtheye
thefourtheye committed Jan 19, 2019
commit 725fc96ef4a8c9667b705cb0cef8729210f731f2
4 changes: 2 additions & 2 deletions tools/mkssldef.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
elif option.startswith('-X'): excludes += option[2:].split(',')
elif option.startswith('-B'): bases += option[2:].split(',')

excludes = map(re.compile, excludes)
excludes = [re.compile(exclude) for exclude in excludes]
exported = []

for filename in filenames:
for line in open(filename).readlines():
name, _, _, meta, _ = re.split('\s+', line)
if any(map(lambda p: p.match(name), excludes)): continue
if any([p.match(name) for p in excludes]): continue
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jan 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need the square brackets here, any() accepts a generator.

Copy link
Copy Markdown
Contributor Author

@thefourtheye thefourtheye Jan 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it to a generator now.

meta = meta.split(':')
assert meta[0] in ('EXIST', 'NOEXIST')
assert meta[2] in ('FUNCTION', 'VARIABLE')
Expand Down