Merge branch 'main' into gh-72904-fnmatch-seps

Lib/pathlib.py

@@ -375,7 +375,7 @@ def _str_normcase(self):
         try:
             return self._str_normcase_cached
         except AttributeError:
-            if _is_case_sensitive(self._flavour):
+            if _is_case_sensitive(self.pathmod):
                 self._str_normcase_cached = self._str
             else:
                 self._str_normcase_cached = self._str.lower()
@@ -656,8 +656,8 @@ def match(self, path_pattern, *, case_sensitive=None):
         if not isinstance(path_pattern, PurePath):
             path_pattern = self.with_segments(path_pattern)
         if case_sensitive is None:
-            case_sensitive = _is_case_sensitive(self._flavour)
-        sep = path_pattern._flavour.sep
+            case_sensitive = _is_case_sensitive(self.pathmod)
+        sep = path_pattern.pathmod.sep
         pattern_str = path_pattern._str
         if path_pattern.drive or path_pattern.root:
             pass
@@ -942,7 +942,7 @@ def _scandir(self):
     def _make_child_relpath(self, name):
         tail = self._tail
         if tail:
-            path_str = f'{self._str}{self._flavour.sep}{name}'
+            path_str = f'{self._str}{self.pathmod.sep}{name}'
         else:
             path_str = f'{self._str}{name}'
         path = self.with_segments(path_str)
@@ -995,7 +995,7 @@ def _glob(self, pattern, case_sensitive, follow_symlinks):
         # do not perform any filesystem access, which can be much faster!
         filter_paths = follow_symlinks is not None and '..' not in pattern_parts
         deduplicate_paths = False
-        sep = self._flavour.sep
+        sep = self.pathmod.sep
         paths = iter([self] if self.is_dir() else [])
         part_idx = 0
         while part_idx < len(pattern_parts):