NEWS.rst

@@ -1,3 +1,12 @@
+v3.19.3
+=======
+
+Bugfixes
+--------
+
+- Also match directories in Path.glob. (#121)
+
+
 v3.19.2
 =======
 

pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 dynamic = ["version"]
 
 [project.urls]
-Homepage = "https://github.com/jaraco/zipp"
+Source = "https://github.com/jaraco/zipp"
 
 [project.optional-dependencies]
 test = [
@@ -32,7 +32,7 @@ test = [
 	"pytest-cov",
 	"pytest-mypy",
 	"pytest-enabler >= 2.2",
-	"pytest-ruff >= 0.2.1",
+	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
 
 	# local
 	"jaraco.itertools",

ruff.toml

@@ -1,6 +1,7 @@
 [lint]
 extend-select = [
 	"C901",
+	"PERF401",
 	"W",
 ]
 ignore = [
@@ -22,7 +23,8 @@ ignore = [
 ]
 
 [format]
-# Enable preview, required for quote-style = "preserve"
+# Enable preview to get hugged parenthesis unwrapping and other nice surprises
+# See https://github.com/jaraco/skeleton/pull/133#issuecomment-2239538373
 preview = true
-# https://docs.astral.sh/ruff/settings/#format-quote-style
+# https://docs.astral.sh/ruff/settings/#format_quote-style
 quote-style = "preserve"

tests/compat/py38.py

@@ -1,9 +1,9 @@
 import sys
 
 
-if sys.version_info >= (3, 9):
-    from importlib.abc import Traversable
-else:  # pragma: no cover
+if (3, 9) <= sys.version_info < (3, 11):  # pragma: no cover
+    from importlib.abc import Traversable  # type: ignore
+elif sys.version_info < (3, 9):  # pragma: no cover
     from importlib_resources.abc import Traversable
 
 

tests/test_path.py

@@ -469,6 +469,18 @@ def test_glob_recursive(self, alpharep):
 
         assert list(root.glob("**/*.txt")) == list(root.rglob("*.txt"))
 
+    @pass_alpharep
+    def test_glob_dirs(self, alpharep):
+        root = zipfile.Path(alpharep)
+        assert list(root.glob('b')) == [zipfile.Path(alpharep, "b/")]
+        assert list(root.glob('b*')) == [zipfile.Path(alpharep, "b/")]
+
+    @pass_alpharep
+    def test_glob_subdir(self, alpharep):
+        root = zipfile.Path(alpharep)
+        assert list(root.glob('g/h')) == [zipfile.Path(alpharep, "g/h/")]
+        assert list(root.glob('g*/h*')) == [zipfile.Path(alpharep, "g/h/")]
+
     @pass_alpharep
     def test_glob_subdirs(self, alpharep):
         root = zipfile.Path(alpharep)

zipp/__init__.py

@@ -470,8 +470,7 @@ def glob(self, pattern):
         prefix = re.escape(self.at)
         tr = Translator(seps='/')
         matches = re.compile(prefix + tr.translate(pattern)).fullmatch
-        names = (data.filename for data in self.root.filelist)
-        return map(self._next, filter(matches, names))
+        return map(self._next, filter(matches, self.root.namelist()))
 
     def rglob(self, pattern):
         return self.glob(f'**/{pattern}')

zipp/glob.py

@@ -28,7 +28,7 @@ def translate(self, pattern):
         """
         Given a glob pattern, produce a regex that matches it.
         """
-        return self.extend(self.translate_core(pattern))
+        return self.extend(self.match_dirs(self.translate_core(pattern)))
 
     def extend(self, pattern):
         r"""
@@ -41,6 +41,14 @@ def extend(self, pattern):
         """
         return rf'(?s:{pattern})\Z'
 
+    def match_dirs(self, pattern):
+        """
+        Ensure that zipfile.Path directory names are matched.
+
+        zipfile.Path directory names always end in a slash.
+        """
+        return rf'{pattern}[/]?'
+
     def translate_core(self, pattern):
         r"""
         Given a glob pattern, produce a regex that matches it.