Windows support

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

src/tox/config/loader/ini/replace.py

@@ -20,7 +20,6 @@
 
 # split alongside :, unless it's escaped, or it's preceded by a single capital letter (Windows drive letter in paths)
 ARGS_GROUP = re.compile(r"(?<!\\\\|:[A-Z]):")
-NOT_ESCAPED_COMMENT = re.compile(r"(?<!\\)#")
 
 
 def replace(conf: "Config", name: Optional[str], loader: "IniLoader", value: str, chain: List[str]) -> str:
@@ -124,8 +123,7 @@ def replace_reference(
                         return loader.process_raw(conf, current_env, src[key])
                     value = src.load(key, chain)
                     as_str, _ = stringify(value)
-                    # escape unescaped comment characters to preserve them during processing
-                    as_str = NOT_ESCAPED_COMMENT.sub("\\#", as_str)
+                    as_str = as_str.replace("#", r"\#")  # escape comment characters as these will be stripped
                     return as_str
                 except KeyError as exc:  # if fails, keep trying maybe another source can satisfy
                     exception = exc

src/tox/config/loader/str_convert.py

@@ -47,8 +47,10 @@ def to_dict(value: str, of_type: Tuple[Type[Any], Type[Any]]) -> Iterator[Tuple[
     @staticmethod
     def to_command(value: str) -> Command:
         is_win = sys.platform == "win32"
+        value = value.replace(r"\#", "#")
         splitter = shlex.shlex(value, posix=not is_win)
         splitter.whitespace_split = True
+        splitter.commenters = ""  # comments handled earlier, and the shlex does not know escaped comment characters
         args: List[str] = []
         pos = 0
         try:

tests/session/cmd/test_show_config.py

@@ -168,7 +168,7 @@ def test_show_config_ini_comment_path(tox_project: ToxProjectCreator, tmp_path:
     set_env =
         A=1 # comment
         # more comment
-    commands = {envpython} -c 'import os; print(os.linesep.join(f"{k}={v!r}" for k, v in os.environ.items()))'
+    commands = {envpython} -c 'import os; print(os.linesep.join(f"{k}={v}" for k, v in os.environ.items()))'
     [testenv:py]
     set_env =
         {[testenv]set_env}
@@ -178,6 +178,6 @@ def test_show_config_ini_comment_path(tox_project: ToxProjectCreator, tmp_path:
     result = project.run("r", "-e", "py")
     result.assert_success()
     a_line = next(i for i in result.out.splitlines() if i.startswith("A="))  # pragma: no branch  # not found raises
-    assert a_line == "A='1'"
+    assert a_line == "A=1"
     b_line = next(i for i in result.out.splitlines() if i.startswith("B="))  # pragma: no branch  # not found raises
-    assert b_line == f"B='{prj_path}'"
+    assert b_line == f"B={prj_path}"

whitelist.txt

@@ -27,6 +27,7 @@ chdir
 cmd
 codec
 colorama
+commenters
 conf
 configs
 conftest