Skip to content

Commit 65ac68c

Browse files
committed
Fixed case where extra slash was printing when tab completing users on Windows
1 parent 3ec6cea commit 65ac68c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## 0.8.8 (TBD, 2018)
1+
## 0.8.9 (TBD 2018)
2+
* Bug Fixes
3+
* Fixed extra slash that could print when tab completing users on Windows
4+
5+
## 0.8.8 (June 28, 2018)
26
* Bug Fixes
37
* Prevent crashes that could occur attempting to open a file in non-existent directory or with very long filename
48
* Enhancements

cmd2.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,12 +1694,15 @@ def complete_users():
16941694
users = []
16951695

16961696
# Windows lacks the pwd module so we can't get a list of users.
1697-
# Instead we will add a slash once the user enters text that
1697+
# Instead we will return a result once the user enters text that
16981698
# resolves to an existing home directory.
16991699
if sys.platform.startswith('win'):
17001700
expanded_path = os.path.expanduser(text)
17011701
if os.path.isdir(expanded_path):
1702-
users.append(text + os.path.sep)
1702+
user = text
1703+
if add_trailing_sep_if_dir:
1704+
user += os.path.sep
1705+
users.append(user)
17031706
else:
17041707
import pwd
17051708

0 commit comments

Comments
 (0)