summaryrefslogtreecommitdiff
path: root/src/pip
diff options
context:
space:
mode:
authorPradyun Gedam <pradyunsg@gmail.com>2023-01-29 01:36:20 +0000
committerGitHub <noreply@github.com>2023-01-29 01:36:20 +0000
commitefedf09c4967dcbe3105e3746aaca7bfb55d605f (patch)
tree5a67befba67db4028b7a6071148595d7bb04c3f4 /src/pip
parent60a45984404460192067f3990e0258deeeafa636 (diff)
parent17e20c746e6b855f6bb4a28bbbfff66706762240 (diff)
downloadpip-efedf09c4967dcbe3105e3746aaca7bfb55d605f.tar.gz
Merge pull request #11759 from pradyunsg/fix-keyring-auth
Closes https://github.com/pypa/pip/issues/11658
Diffstat (limited to 'src/pip')
-rw-r--r--src/pip/_internal/network/auth.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py
index 68b5a5f45..c16213268 100644
--- a/src/pip/_internal/network/auth.py
+++ b/src/pip/_internal/network/auth.py
@@ -128,7 +128,7 @@ class KeyRingCliProvider(KeyRingBaseProvider):
)
if res.returncode:
return None
- return res.stdout.decode("utf-8").strip("\n")
+ return res.stdout.decode("utf-8").strip(os.linesep)
def _set_password(self, service_name: str, username: str, password: str) -> None:
"""Mirror the implementation of keyring.set_password using cli"""
@@ -136,7 +136,7 @@ class KeyRingCliProvider(KeyRingBaseProvider):
return None
cmd = [self.keyring, "set", service_name, username]
- input_ = password.encode("utf-8") + b"\n"
+ input_ = (password + os.linesep).encode("utf-8")
env = os.environ.copy()
env["PYTHONIOENCODING"] = "utf-8"
res = subprocess.run(cmd, input=input_, env=env)