aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/Lib/posixpath.py
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2024-07-02 22:47:57 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2024-07-02 22:59:47 +0300
commit96b239778766d32d5158aca805e08199b3c0a743 (patch)
treea9c8679261a62138ec4735d878a11f6478cd196a /contrib/tools/python3/Lib/posixpath.py
parent292e7317266c2136a1e1bd027e16e6eefb639028 (diff)
downloadydb-96b239778766d32d5158aca805e08199b3c0a743.tar.gz
Update contrib/tools/python3 to 3.12.4
6e8edffbef193b35b45ddccdc3beda6bb2627186
Diffstat (limited to 'contrib/tools/python3/Lib/posixpath.py')
-rw-r--r--contrib/tools/python3/Lib/posixpath.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/contrib/tools/python3/Lib/posixpath.py b/contrib/tools/python3/Lib/posixpath.py
index e4f155e41a..f1e4237b3a 100644
--- a/contrib/tools/python3/Lib/posixpath.py
+++ b/contrib/tools/python3/Lib/posixpath.py
@@ -290,7 +290,7 @@ def expanduser(path):
return path
name = path[1:i]
if isinstance(name, bytes):
- name = str(name, 'ASCII')
+ name = os.fsdecode(name)
try:
pwent = pwd.getpwnam(name)
except KeyError:
@@ -371,7 +371,7 @@ def expandvars(path):
# if it contains symbolic links!
try:
- from posix import _path_normpath
+ from posix import _path_normpath as normpath
except ImportError:
def normpath(path):
@@ -404,14 +404,6 @@ except ImportError:
path = initial_slashes + sep.join(comps)
return path or dot
-else:
- def normpath(path):
- """Normalize path, eliminating double slashes, etc."""
- path = os.fspath(path)
- if isinstance(path, bytes):
- return os.fsencode(_path_normpath(os.fsdecode(path))) or b"."
- return _path_normpath(path) or "."
-
def abspath(path):
"""Return an absolute path."""