Skip to content

[v14.x] tools: make utils.SearchFiles Python2-compatible #40020

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
wants to merge 2 commits into from
Closed

[v14.x] tools: make utils.SearchFiles Python2-compatible #40020

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0162bca
tools: make utils.SearchFiles Python2-compatible
targos Sep 6, 2021
f0578e9
fixup! tools: make utils.SearchFiles Python2-compatible
targos Sep 6, 2021
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
12 changes: 8 additions & 4 deletions tools/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


import glob
import os
import platform
import re
import sys
Expand Down Expand Up @@ -111,7 +111,11 @@ def IsWindows():


def SearchFiles(dir, ext):
list = glob.glob(dir+ '/**/*.' + ext, recursive=True)
matching_files = []
for path, dirs, files in os.walk(dir):
for file in files:
if file.endswith('.' + ext):
matching_files.append(path + '/' + file)
if sys.platform == 'win32':
list = [ x.replace('\\', '/')for x in list]
return list
matching_files = [x.replace('\\', '/') for x in matching_files]
return matching_files