# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1289147860 -3600
# Node ID 360498cc71f600f48b0a23e1b130c7117fd7b861
# Parent 2203d078dd485640a5be1d6e8c8782e15e33065f
avoid parsing of path objects when pytest.main(path) is called.
--- a/pytest/main.py
+++ b/pytest/main.py
@@ -410,9 +410,9 @@ _preinit = [PluginManager(load=True)] #
def main(args=None, plugins=None):
if args is None:
args = sys.argv[1:]
+ elif isinstance(args, py.path.local):
+ args = [str(args)]
elif not isinstance(args, (tuple, list)):
- if isinstance(args, py.path.local):
- args = str(args)
if not isinstance(args, str):
raise ValueError("not a string or argument list: %r" % (args,))
args = py.std.shlex.split(args)
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
