Skip whitespace in envstr. (tox-dev#670)

* Skip whitespace in envstr. * Mention stripping whitespace in env name in the docs.

Author: andreif

doc/config.rst

@@ -567,6 +567,11 @@ You can still list environments explicitly along with generated ones::
 
  envlist = {py26,py27}-django{15,16}, docs, flake
 
+Keep in mind that whitespace characters (except newline) within ``{}``
+are stripped, so the following line defines the same environment names::
+
+ envlist = {py26, py27}-django{ 15, 16 }, docs, flake
+
 .. note::
 
  To help with understanding how the variants will produce section values,

tests/test_config.py

@@ -160,7 +160,7 @@ def test_config_parse_platform_with_factors(self, newconfig, plat, monkeypatch):
  monkeypatch.setattr(sys, "platform", "win32")
  config = newconfig([], """
  [tox]
- envlist = py27-{win,lin,osx}
+ envlist = py27-{win, lin,osx }
  [testenv]
  platform =
  win: win32

tox/config.py

@@ -895,7 +895,7 @@ def _expand_envstr(envstr):
 
  def expand(env):
  tokens = re.split(r'\{([^}]+)\}', env)
- parts = [token.split(',') for token in tokens]
+ parts = [re.sub('\s+', '', token).split(',') for token in tokens]
  return [''.join(variant) for variant in itertools.product(*parts)]
 
  return mapcat(expand, envlist)