synced/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2025-03-14 10:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Concatenate str only in os.path.join

Browse Source 
Closes gh-316.
This commit is contained in:
gfyoung
2017-05-22 22:50:59 -04:00
parent 30cbb9a1ec
commit 2aecbf9707
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
updateHostsFile.py
View File

@ -728,7 +728,8 @@ def recursive_glob(stem, file_pattern):
if sys.version_info >= (3, 5):
return glob(stem + "/**/" + file_pattern, recursive=True)
else:
if stem == "*":
# gh-316: this will avoid invalid unicode comparisons in Python 2.x
if stem == str("*"):
stem = "."
matches = []
for root, dirnames, filenames in os.walk(stem):
@ -759,6 +760,10 @@ def path_join_robust(path, *paths):
"""
try:
# gh-316: joining unicode and str can be saddening in Python 2.x
path = str(path)
paths = [str(another_path) for another_path in paths]
return os.path.join(path, *paths)
except UnicodeDecodeError as e:
raise locale.Error("Unable to construct path. This is "