diff options
| author | holger krekel <holger@merlinux.eu> | 2015-11-20 22:36:39 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2015-11-20 22:36:39 +0100 |
| commit | 4934b5fdd8e5517b1dc781bd6590d61d0d5b395b (patch) | |
| tree | 2fe3ed860078642febb2691700153d67cce0cc16 /tox | |
| parent | 29861cd9565db7f47d6e40e1245c12c2744e6bcf (diff) | |
| parent | 65e64d4e24af25e0df927aa88ef427e6c2333f50 (diff) | |
| download | tox-4934b5fdd8e5517b1dc781bd6590d61d0d5b395b.tar.gz | |
merge default
Diffstat (limited to 'tox')
| -rw-r--r-- | tox/__init__.py | 2 | ||||
| -rw-r--r-- | tox/config.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tox/__init__.py b/tox/__init__.py index f69bc2d..837768c 100644 --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '2.2.2.dev1' +__version__ = '2.3.0.dev1' from .hookspecs import hookspec, hookimpl # noqa diff --git a/tox/config.py b/tox/config.py index 7a500f0..480704b 100644 --- a/tox/config.py +++ b/tox/config.py @@ -1040,9 +1040,6 @@ class _ArgvlistReader: current_command = "" for line in value.splitlines(): line = line.rstrip() - i = line.find("#") - if i != -1: - line = line[:i].rstrip() if not line: continue if line.endswith("\\"): @@ -1094,7 +1091,6 @@ class _ArgvlistReader: shlexer = shlex.shlex(newcommand, posix=True) shlexer.whitespace_split = True shlexer.escape = '' - shlexer.commenters = '' argv = list(shlexer) return argv |