8000 bpo-45192: Fix a bug that infers the type of an os.PathLike[bytes] ob… · python/cpython@d33fae7 · GitHub
[go: up one dir, main page]
Skip to content

    • Commit d33fae7

    Browse files
    miss-islingtonrekyungmin
    miss-islington
    and
    rekyungmin
    authored
    bpo-45192: Fix a bug that infers the type of an os.PathLike[bytes] object as str (GH-28323) (GH-29112)
    An object implementing the os.PathLike protocol can represent a file system path as a str or bytes object. Therefore, _infer_return_type function should infer os.PathLike[str] object as str type and os.PathLike[bytes] object as bytes type. (cherry picked from commit 6270d3e) Co-authored-by: Kyungmin Lee <rekyungmin@gmail.com>
    1 parent 427ab12 commit d33fae7

    File tree

    3 files changed

    +28
    -0
    lines changed

    3 files changed

    +28
    -0
    lines changed

    ‎Lib/tempfile.py

    Lines changed: 4 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -88,6 +88,10 @@ def _infer_return_type(*args):
    8888
    for arg in args:
    8989
    if arg is None:
    9090
    continue
    91+
    92+
    if isinstance(arg, _os.PathLike):
    93+
    arg = _os.fspath(arg)
    94+
    9195
    if isinstance(arg, bytes):
    9296
    if return_type is str:
    9397
    raise TypeError("Can't mix bytes and non-bytes in "
    8000

    ‎Lib/test/test_tempfile.py

    Lines changed: 19 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -60,6 +60,25 @@ def test_infer_return_type_multiples_and_none(self):
    6060
    def test_infer_return_type_pathlib(self):
    6161
    self.assertIs(str, tempfile._infer_return_type(pathlib.Path('/')))
    6262

    63+
    def test_infer_return_type_pathlike(self):
    64+
    class Path:
    65+
    def __init__(self, path):
    66+
    self.path = path
    67+
    68+
    def __fspath__(self):
    69+
    return self.path
    70+
    71+
    self.assertIs(str, tempfile._infer_return_type(Path('/')))
    72+
    self.assertIs(bytes, tempfile._infer_return_type(Path(b'/')))
    73+
    self.assertIs(str, tempfile._infer_return_type('', Path('')))
    74+
    self.assertIs(bytes, tempfile._infer_return_type(b'', Path(b'')))
    75+
    self.assertIs(bytes, tempfile._infer_return_type(None, Path(b'')))
    76+
    self.assertIs(str, tempfile._infer_return_type(None, Path('')))
    77+
    78+
    with self.assertRaises(TypeError):
    79+
    tempfile._infer_return_type('', Path(b''))
    80+
    with self.assertRaises(TypeError):
    81+
    tempfile._infer_return_type(b'', Path(''))
    6382

    6483
    # Common functionality.
    6584

    ‎Misc/NEWS.d/next/Library/2021-09-14-15-52-47.bpo-45192.DjA-BI.rst

    Lines changed: 5 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,5 @@
    1+
    Fix the ``tempfile._infer_return_type`` function so that the ``dir``
    2+
    argument of the :mod:`tempfile` functions accepts an object implementing the
    3+
    ``os.PathLike`` protocol.
    4+
    5+
    Patch by Kyungmin Lee.

    0 commit comments

    Comments
     (0)
    0