Skip to content

Commit 46e9a3d

Browse files
authored
Getuser (#279)
* Use getuser for default user name - user keyword arg no longer required on windows * Updated changelog
1 parent 89e9b18 commit 46e9a3d

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Changelog.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Change Log
22
============
33

4+
2.6.0
5+
+++++
6+
7+
Changes
8+
-------
9+
10+
* ``user`` keyword argument no longer required on Windows - exception is raised if user cannot be identified.
411

512
2.5.4
613
+++++

pssh/clients/base/single.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717

1818
import logging
1919
import os
20-
try:
21-
import pwd
22-
except ImportError:
23-
WIN_PLATFORM = True
24-
else:
25-
WIN_PLATFORM = False
20+
from getpass import getuser
2621
from socket import gaierror as sock_gaierror, error as sock_error
2722

2823
from gevent import sleep, socket, Timeout as GTimeout
@@ -174,11 +169,7 @@ def __init__(self, host,
174169
identity_auth=True):
175170
self._auth_thread_pool = _auth_thread_pool
176171
self.host = host
177-
self.user = user if user else None
178-
if self.user is None and not WIN_PLATFORM:
179-
self.user = pwd.getpwuid(os.geteuid()).pw_name
180-
elif self.user is None and WIN_PLATFORM:
181-
raise ValueError("Must provide user parameter on Windows")
172+
self.user = user if user else getuser()
182173
self.password = password
183174
self.port = port if port else 22
184175
self.num_retries = num_retries

0 commit comments

Comments
 (0)