From 8b4f65e405e9881cfcaf3014b1abbdc832c6da7b Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 21 Apr 2015 16:39:13 +0200
Subject: fix issue233: avoid hanging with tox-setuptools integration example.
 Thanks simonb.

---
 CHANGELOG             | 2 ++
 doc/example/basic.txt | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index dc8ec7e..b1e8d49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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(
-- 
cgit v1.2.1