Fix Windows regression

Author: cpburnz

tests/test_01_util.py

@@ -5,14 +5,16 @@
 import errno
 import os
 import os.path
-import pathlib
 import shutil
 import tempfile
 import unittest
 from collections.abc import (
 	Iterable)
 from functools import (
 	partial)
+from pathlib import (
+	Path,
+	PurePath)
 from typing import (
 	ClassVar,
 	Optional)  # Replaced by `X | None` in 3.10.
@@ -151,7 +153,7 @@ def setUp(self) -> None:
 		"""
 		Called before each test.
 		"""
-		self.temp_dir = pathlib.Path(tempfile.mkdtemp())
+		self.temp_dir = Path(tempfile.mkdtemp())
 
 	def tearDown(self) -> None:
 		"""
@@ -701,8 +703,8 @@ class NormalizeFileTest(unittest.TestCase):
 
 	def test_01_purepath(self):
 		"""
-		Tests normalizing a :class:`pathlib.PurePath` as argument.
+		Tests normalizing a :class:`PurePath` as argument.
 		"""
-		first_spec = normalize_file(pathlib.PurePath('a.txt'))
+		first_spec = normalize_file(PurePath('a.txt'))
 		second_spec = normalize_file('a.txt')
 		self.assertEqual(first_spec, second_spec)

tests/test_03_pathspec.py

@@ -676,14 +676,14 @@ def test_05_match_tree_entries(self):
 			'!b.txt',
 		]):
 			with sub_test() as spec:
-				files = {
+				files = set(map(ospath, [
 					'X/a.txt',
 					'X/b.txt',
 					'X/Z/c.txt',
 					'Y/a.txt',
 					'Y/b.txt',
 					'Y/Z/c.txt',
-				}
+				]))
 
 				self.make_dirs([
 					'X',
@@ -713,14 +713,14 @@ def test_05_match_tree_files(self):
 			'!b.txt',
 		]):
 			with sub_test() as spec:
-				files = {
+				files = set(map(ospath, [
 					'X/a.txt',
 					'X/b.txt',
 					'X/Z/c.txt',
 					'Y/a.txt',
 					'Y/b.txt',
 					'Y/Z/c.txt',
-				}
+				]))
 
 				self.make_dirs([
 					'X',

tests/util.py

@@ -49,7 +49,9 @@ def debug_includes(spec: PathSpec, files: set[str], includes: set[str]) -> str:
 	"""
 	results = []
 	for result in spec.check_files(files):
-		assert (ospath(result.file) in includes) == bool(result.include), (result, includes)
+		assert (result.file in includes) == bool(result.include), {
+			'result': result, 'includes': includes,
+		}
 		results.append(result)
 
 	return debug_results(spec, results)