Skip to content

Fix a small issue about shlex.split not working well with win32 path #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 20, 2016
Merged

Fix a small issue about shlex.split not working well with win32 path #1523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd24256
Fix a small issue about shlex.split not working well with win32 path
afterhill Apr 19, 2016
1a37035
Add test test_absolute_win32_path
afterhill Apr 19, 2016
f51c34e
Add changelog
afterhill Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,4 @@ Russel Winder
Ben Webb
Alexei Kozlenok
Cal Leeming
Feng Ma
5 changes: 4 additions & 1 deletion _pytest/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ def _prepareconfig(args=None, plugins=None):
elif not isinstance(args, (tuple, list)):
if not isinstance(args, str):
raise ValueError("not a string or argument list: %r" % (args,))
args = shlex.split(args)
if sys.platform == "win32":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about just using shlex.split(args, posix=sys.platform == "win32")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RonnyPfannschmidt of course meant shlex.split(args, posix=sys.platform != 'win32'). 😉

args = shlex.split(args, posix=False)
else:
args = shlex.split(args)
config = get_config()
pluginmanager = config.pluginmanager
try:
Expand Down