diff options
author | atomlong | 2021-10-23 17:55:22 +0800 |
---|---|---|
committer | atomlong | 2021-10-23 18:06:15 +0800 |
commit | 80096c8de4b34ec1ed8f30bb428918cd592b2424 (patch) | |
tree | b48dd1e73de9ea35a4709fb6b93deb16331ec514 /0134-expanduser-normpath-paths-coming-from-env-vars.patch | |
parent | 89a67c05174951d172252b1db96ff93cc4ec4bcd (diff) | |
download | aur-80096c8de4b34ec1ed8f30bb428918cd592b2424.tar.gz |
update to 3.9.7
Diffstat (limited to '0134-expanduser-normpath-paths-coming-from-env-vars.patch')
-rw-r--r-- | 0134-expanduser-normpath-paths-coming-from-env-vars.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/0134-expanduser-normpath-paths-coming-from-env-vars.patch b/0134-expanduser-normpath-paths-coming-from-env-vars.patch deleted file mode 100644 index 9b7fb03aa16a..000000000000 --- a/0134-expanduser-normpath-paths-coming-from-env-vars.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6f3a083adc2e679029614ecb2ce4aa2f066324b1 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter <reiter.christoph@gmail.com> -Date: Sun, 8 Aug 2021 10:17:35 +0200 -Subject: [PATCH 134/N] expanduser: normpath paths coming from env vars - -This makes sure we get the same paths as with related functions in pathlib. ---- - Lib/ntpath.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index 77f5614..5d1c6b9 100644 ---- a/Lib/ntpath.py -+++ b/Lib/ntpath.py -@@ -319,7 +319,7 @@ def expanduser(path): - if 'USERPROFILE' in os.environ: - userhome = os.environ['USERPROFILE'] - elif not 'HOMEPATH' in os.environ: -- return path -+ return os.path.normpath(path) - else: - try: - drive = os.environ['HOMEDRIVE'] -@@ -333,7 +333,7 @@ def expanduser(path): - if i != 1: #~user - userhome = join(dirname(userhome), path[1:i]) - -- return userhome + path[i:] -+ return os.path.normpath(userhome) + path[i:] - - - # Expand paths containing shell variable substitutions. --- -2.32.0 - |