mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
bpo-33721: Make some os.path functions and pathlib.Path methods be tolerant to invalid paths. (#7695)
Such functions as os.path.exists(), os.path.lexists(), os.path.isdir(), os.path.isfile(), os.path.islink(), and os.path.ismount() now return False instead of raising ValueError or its subclasses UnicodeEncodeError and UnicodeDecodeError for paths that contain characters or bytes unrepresentative at the OS level.
This commit is contained in:
parent
7bdf28265a
commit
0185f34ddc
15 changed files with 181 additions and 54 deletions
|
@ -1331,6 +1331,9 @@ class Path(PurePath):
|
|||
if e.errno not in _IGNORED_ERROS:
|
||||
raise
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
return True
|
||||
|
||||
def is_dir(self):
|
||||
|
@ -1345,6 +1348,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_file(self):
|
||||
"""
|
||||
|
@ -1359,6 +1365,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_mount(self):
|
||||
"""
|
||||
|
@ -1392,6 +1401,9 @@ class Path(PurePath):
|
|||
raise
|
||||
# Path doesn't exist
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_block_device(self):
|
||||
"""
|
||||
|
@ -1405,6 +1417,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_char_device(self):
|
||||
"""
|
||||
|
@ -1418,6 +1433,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_fifo(self):
|
||||
"""
|
||||
|
@ -1431,6 +1449,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def is_socket(self):
|
||||
"""
|
||||
|
@ -1444,6 +1465,9 @@ class Path(PurePath):
|
|||
# Path doesn't exist or is a broken symlink
|
||||
# (see https://bitbucket.org/pitrou/pathlib/issue/12/)
|
||||
return False
|
||||
except ValueError:
|
||||
# Non-encodable path
|
||||
return False
|
||||
|
||||
def expanduser(self):
|
||||
""" Return a new path with expanded ~ and ~user constructs
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue