getuser may not work in windows

tuyethoa08041997 · Apr 27, 2017 · 1b90075 · 1b90075
1 parent 798f266
commit 1b90075
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pupy/modules/users.py b/pupy/modules/users.py
@@ -10,7 +10,7 @@ class Users(PupyModule):
     """ Get interactive users """
 
     dependencies = {
-        'windows': ['win32net'],
+        'windows': ['win32net', 'win32api'],
         'all': ['pupyutils.users']
     }
 

diff --git a/pupy/packages/all/pupyutils/users.py b/pupy/packages/all/pupyutils/users.py
@@ -3,13 +3,12 @@
 
 if os.name == 'nt':
     import win32net
-    import socket
+    import win32api
 
     def users():
         result = []
-        hostname = socket.gethostname()
-        users, _, _ = win32net.NetUserEnum(hostname, 1)
-        current = getpass.getuser()
+        users, _, _ = win32net.NetUserEnum(None, 1)
+        current = win32api.GetUserName()
 
         UF_ACCOUNT_DISABLE = 2
         UF_LOCKOUT = 16
@@ -20,7 +19,7 @@ def users():
 
             result.append({
                 'name': user['name'],
-                'groups': win32net.NetUserGetLocalGroups(hostname, user['name']),
+                'groups': win32net.NetUserGetLocalGroups(None, user['name']),
                 'admin': user['priv'] == 2
             })