diff options
author | holger krekel <holger@merlinux.eu> | 2015-04-21 16:39:13 +0200 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2015-04-21 16:39:13 +0200 |
commit | 8b4f65e405e9881cfcaf3014b1abbdc832c6da7b (patch) | |
tree | fe3382a6aba374ec638722f8c0a7222cee1c02f4 | |
parent | e376e97c966e2f0bcd1286d3b928b2d8cab45768 (diff) | |
download | tox-8b4f65e405e9881cfcaf3014b1abbdc832c6da7b.tar.gz |
fix issue233: avoid hanging with tox-setuptools integration example. Thanks simonb.
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | doc/example/basic.txt | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -19,6 +19,8 @@ - remove the long-deprecated "distribute" option as it has no effect these days. +- fix issue233: avoid hanging with tox-setuptools integration example. Thanks simonb. + 1.9.2 ----------- diff --git a/doc/example/basic.txt b/doc/example/basic.txt index f4df233..d0ad004 100644 --- a/doc/example/basic.txt +++ b/doc/example/basic.txt @@ -254,7 +254,10 @@ a test run when ``python setup.py test`` is issued:: #import here, cause outside the eggs aren't loaded import tox import shlex - errno = tox.cmdline(args=shlex.split(self.tox_args)) + args = self.tox_args + if args: + args = shlex.split(self.tox_args) + errno = tox.cmdline(args=args) sys.exit(errno) setup( |