Added some basic user completion on Windows

Author: kmvanbrunt

cmd2.py

@@ -1602,29 +1602,35 @@ def path_complete(self, text, line, begidx, endidx, dir_exe_only=False, dir_only
 
         # Used to complete ~ and ~user strings with a list of users that have existing home dirs
         def complete_users():
-            # Only works on Unix systems
-            try:
-                import pwd
-            except ImportError:
-                return []
 
-            # Get a list of users from password database
+            # We are returning ~user strings that resolve to directories, so don't append a space or quote
+            self.allow_appended_space = False
+            self.allow_closing_quote = False
+
             users = []
-            for cur_pw in pwd.getpwall():
 
-                # Check if the user has an existing home dir
-                if os.path.isdir(cur_pw.pw_dir):
+            # Windows lacks the pwd module so we can't get a list of users.
+            # Instead we will add a slash once the user enters text that
+            # resolves to an existing home directory.
+            if sys.platform.startswith('win'):
+                expanded_path = os.path.expanduser(text)
+                if os.path.isdir(expanded_path):
+                    users.append(text + os.path.sep)
+            else:
+                import pwd
 
-                    # Add a ~ to the user to match against text
-                    cur_user = '~' + cur_pw.pw_name
-                    if cur_user.startswith(text):
-                        if add_trailing_sep_if_dir:
-                            cur_user += os.path.sep
-                        users.append(cur_user)
+                # Iterate through a list of users from the password database
+                for cur_pw in pwd.getpwall():
 
-            # These are directories, so don't add a space or quote
-            self.allow_appended_space = False
-            self.allow_closing_quote = False
+                    # Check if the user has an existing home dir
+                    if os.path.isdir(cur_pw.pw_dir):
+
+                        # Add a ~ to the user to match against text
+                        cur_user = '~' + cur_pw.pw_name
+                        if cur_user.startswith(text):
+                            if add_trailing_sep_if_dir:
+                                cur_user += os.path.sep
+                            users.append(cur_user)
 
             return users
 

tests/test_completion.py

@@ -352,12 +352,8 @@ def test_path_completion_expand_user_dir(cmd2_app):
     begidx = endidx - len(text)
     completions = cmd2_app.path_complete(text, line, begidx, endidx)
 
-    # On Windows there should be no results, since it lacks the pwd module
-    if sys.platform.startswith('win'):
-        assert completions == []
-    else:
-        expected = text + os.path.sep
-        assert expected in completions
+    expected = text + os.path.sep
+    assert expected in completions
 
 def test_path_completion_user_expansion(cmd2_app):
     # Run path with a tilde and a slash