Fix make_twill_filename

Author: Cito

src/twill/utils.py

@@ -461,7 +461,9 @@ def get_equiv_refresh_interval() -> Optional[int]:
 
 def is_hidden_filename(filename: str) -> bool:
     """Check if this is a hidden file (starting with a dot)."""
-    return filename not in (".", "..") and Path(filename).name.startswith(".")
+    return filename not in (os.curdir, os.pardir) and Path(
+        filename
+    ).name.startswith(".")
 
 
 def is_twill_filename(filename: str) -> bool:
@@ -471,14 +473,13 @@ def is_twill_filename(filename: str) -> bool:
 
 def make_twill_filename(name: str) -> str:
     """Add the twill extension to the name of a script if necessary."""
-    if name not in (".", ".."):
+    if name not in (os.curdir, os.pardir):
         path = Path(name)
-        twill_name = path.stem
-        ext = path.suffix
-        if not ext:
-            twill_name += twill_ext
-            if Path(twill_name).exists():
-                name = twill_name
+        if not (path.suffix or (path.exists() and not path.is_dir())):
+            twill_path = path.with_suffix(twill_ext)
+            if twill_path.exists() and not twill_path.is_dir():
+                path = twill_path
+        name = str(path)
     return name
 
 

tests/test_gather.py

@@ -10,7 +10,7 @@ def test_gather_dir():
 
     os.chdir(test_dir)
     try:
-        files = gather_filenames((".",))
+        files = gather_filenames((os.curdir,))
         if os.sep != "/":
             files = [f.replace(os.sep, "/") for f in files]
         assert sorted(files) == sorted(

tests/test_utils.py

@@ -1,8 +1,25 @@
+from pathlib import Path
+
 import pytest
 from twill import utils
 from twill.errors import TwillException
 
 
+def test_is_hidden_filename():
+    is_hidden_filename = utils.is_hidden_filename
+    assert not is_hidden_filename("foo")
+    assert is_hidden_filename(".foo")
+    assert not is_hidden_filename(".foo/bar")
+    assert is_hidden_filename("foo/.bar")
+
+
+def test_is_twill_filename():
+    is_twill_filename = utils.is_twill_filename
+    assert not is_twill_filename("foo")
+    assert is_twill_filename("foo.twill")
+    assert not is_twill_filename(".foo.twill")
+
+
 def test_make_boolean():
     make_boolean = utils.make_boolean
     assert make_boolean(True)  # noqa: FBT003
@@ -19,6 +36,18 @@ def test_make_boolean():
         make_boolean("no")
 
 
+def test_make_twill_filename():
+    make_twill_filename = utils.make_twill_filename
+    assert make_twill_filename("test_foo") == "test_foo"
+    assert make_twill_filename("../tests/test_foo") == str(
+        Path("../tests/test_foo")
+    )
+    assert make_twill_filename("test_basic") == "test_basic.twill"
+    assert make_twill_filename("../tests/test_basic") == str(
+        Path("../tests/test_basic.twill")
+    )
+
+
 def test_trunc():
     trunc = utils.trunc
     assert trunc("hello, world!", 12) == "hello, w ..."