Make Globber arguments keyword-only

Author: barneygale

Lib/glob.py

@@ -169,7 +169,7 @@ class _GlobberBase:
     """Abstract class providing shell-style pattern matching and globbing.
     """
 
-    def __init__(self, sep=os.path.sep, case_sensitive=os.name != 'nt',
+    def __init__(self, *, sep=os.path.sep, case_sensitive=os.name != 'nt',
                  case_pedantic=False, recursive=False, include_hidden=False):
         self.sep = sep
         self.case_sensitive = case_sensitive

Lib/pathlib/__init__.py

@@ -558,8 +558,10 @@ def full_match(self, pattern, *, case_sensitive=None):
         # paths shouldn't match wildcards, so we change it to the empty string.
         path = str(self) if self.parts else ''
         pattern = str(pattern) if pattern.parts else ''
-        globber = _StringGlobber(self.parser.sep, case_sensitive,
-                                 recursive=True, include_hidden=True)
+        globber = _StringGlobber(sep=self.parser.sep,
+                                 case_sensitive=case_sensitive,
+                                 recursive=True,
+                                 include_hidden=True)
         return globber.compile(pattern)(path) is not None
 
     def match(self, path_pattern, *, case_sensitive=None):
@@ -581,7 +583,8 @@ def match(self, path_pattern, *, case_sensitive=None):
             return False
         if len(path_parts) > len(pattern_parts) and path_pattern.anchor:
             return False
-        globber = _StringGlobber(self.parser.sep, case_sensitive)
+        globber = _StringGlobber(sep=self.parser.sep,
+                                 case_sensitive=case_sensitive)
         for path_part, pattern_part in zip(path_parts, pattern_parts):
             match = globber.compile(pattern_part)
             if match(path_part) is None:
@@ -850,8 +853,11 @@ def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=False):
             case_pedantic = True
         parts = self._parse_pattern(pattern)
         recursive = True if recurse_symlinks else _no_recurse_symlinks
-        globber = _StringGlobber(self.parser.sep, case_sensitive, case_pedantic,
-                                 recursive, include_hidden=True)
+        globber = _StringGlobber(sep=self.parser.sep,
+                                 case_sensitive=case_sensitive,
+                                 case_pedantic=case_pedantic,
+                                 recursive=recursive,
+                                 include_hidden=True)
         select = globber.selector(parts[::-1])
         root = str(self)
         paths = select(self.parser.join(root, ''))

Lib/pathlib/types.py

@@ -240,8 +240,10 @@ def full_match(self, pattern):
         pattern is matched against the entire path.
         """
         case_sensitive = self.parser.normcase('Aa') == 'Aa'
-        globber = _PathGlobber(self.parser.sep, case_sensitive,
-                               recursive=True, include_hidden=True)
+        globber = _PathGlobber(sep=self.parser.sep,
+                               case_sensitive=case_sensitive,
+                               recursive=True,
+                               include_hidden=True)
         match = globber.compile(pattern, altsep=self.parser.altsep)
         return match(vfspath(self)) is not None
 
@@ -310,8 +312,10 @@ def glob(self, pattern, *, recurse_symlinks=True):
         elif not recurse_symlinks:
             raise NotImplementedError("recurse_symlinks=False is unsupported")
         case_sensitive = self.parser.normcase('Aa') == 'Aa'
-        globber = _PathGlobber(self.parser.sep, case_sensitive,
-                               recursive=True, include_hidden=True)
+        globber = _PathGlobber(sep=self.parser.sep,
+                               case_sensitive=case_sensitive,
+                               recursive=True,
+                               include_hidden=True)
         select = globber.selector(parts)
         return select(self.joinpath(''))