Make Tox Multi-OS Friendly

tox.ini

@@ -20,12 +20,12 @@ max-line-length = 120
 
 [tox]
 envlist = py27, flake8, docs
-minversion=1.8
+minversion=2.0
 
 [testenv]
 install_command = pip install --ignore-installed {opts} {packages}
 passenv = DISPLAY PYTHONPATH
-setenv = PYTHONPATH = {toxinidir}:
+setenv = PYTHONPATH = {toxinidir}
 sitepackages = True
 deps =
     twisted[tls]
@@ -61,20 +61,20 @@ commands = pytest -v --basetemp=_pytest_temp -s -m "gtkui" deluge/tests
 commands = pytest -v --basetemp=_pytest_temp -s -m "todo" deluge/tests
 
 [testenv:trial]
-setenv = {[testenv]setenv}:{toxinidir}/deluge/tests
+setenv = {[testenv]setenv}{:}{toxinidir}/deluge/tests
 commands =
     python -c "import libtorrent as lt; print lt.__version__"
     python -m twisted.trial --reporter=deluge-reporter deluge.tests
 
 [testenv:plugins]
-setenv = PYTHONPATH = {toxinidir}:{toxinidir}/deluge/plugins
+setenv = PYTHONPATH = {toxinidir}{:}{toxinidir}/deluge/plugins
 whitelist_externals = bash
 commands =
     python setup.py build_plugins --develop --install-dir={toxinidir}/deluge/plugins/
     pytest -v --basetemp=_pytest_temp -s -m "not gtkui" deluge/plugins
 
 [testenv:pluginsgtkui]
-setenv = PYTHONPATH = {toxinidir}:{toxinidir}/deluge/plugins
+setenv = PYTHONPATH = {toxinidir}{:}{toxinidir}/deluge/plugins
 commands =
     python setup.py build_plugins --develop --install-dir={toxinidir}/deluge/plugins/
     pytest -v --basetemp=_pytest_temp -s deluge/plugins