Fixes from code review.

Author: atollk

fs/base.py

@@ -1661,6 +1661,10 @@ def match(self, patterns, name, accept_prefix=False):
             True
             >>> my_fs.match(['*.jpg', '*.png'], 'foo.gif')
             False
+            >>> my_fs.match(['dir/file.txt'], 'dir/', accept_prefix=True)
+            True
+            >>> my_fs.match(['dir/file.txt'], 'dir/gile.txt', accept_prefix=True)
+            False
 
         Note:
             If ``patterns`` is `None` (or ``['*']``), then this

fs/errors.py

@@ -42,6 +42,7 @@
     "OperationFailed",
     "OperationTimeout",
     "PathError",
+    "PatternError",
     "PermissionDenied",
     "RemoteConnectionError",
     "RemoveRootError",
@@ -51,6 +52,7 @@
     "ResourceNotFound",
     "ResourceReadOnly",
     "Unsupported",
+    "UnsupportedHash",
 ]
 
 
@@ -346,3 +348,19 @@ class UnsupportedHash(ValueError):
     not supported by hashlib.
 
     """
+
+
+class PatternError(ValueError):
+    """A string pattern with invalid syntax was given."""
+
+    default_message = "pattern '{pattern}' is invalid at position {position}"
+
+    def __init__(self, pattern, position, exc=None, msg=None):  # noqa: D107
+        # type: (Text, int, Optional[Exception], Optional[Text]) -> None
+        self.pattern = pattern
+        self.position = position
+        self.exc = exc
+        super(ValueError, self).__init__()
+
+    def __reduce__(self):
+        return type(self), (self.path, self.position, self.exc, self._msg)

fs/wildcard.py

@@ -13,6 +13,8 @@
 
 import typing
 
+from ._repr import make_repr
+from .errors import PatternError
 from .lrucache import LRUCache
 
 if typing.TYPE_CHECKING:
@@ -142,6 +144,7 @@ def get_matcher(patterns, case_sensitive, accept_prefix=False):
 
 class _PatternMatcher:
     def __init__(self, pattern, case_sensitive, accept_prefixes):
+        self.pattern = pattern
         self.case_sensitive = case_sensitive
         self.accept_prefixes = accept_prefixes
 
@@ -151,11 +154,11 @@ def __init__(self, pattern, case_sensitive, accept_prefixes):
             if pattern[i] == "[":
                 start = i
                 i = pattern.find("]", i) + 1
+                if i == 0:
+                    raise PatternError(pattern, len(pattern) - 1)
                 self.tokens.append(_PatternMatcherToken(pattern[start:i]))
             elif pattern[i] == "]":
-                raise ValueError(
-                    pattern + " is not a valid wildcard pattern. (unmatched ])"
-                )
+                raise PatternError(pattern, i)
             elif pattern[i] == "?":
                 self.tokens.append(_PatternMatcherToken("?"))
                 i += 1
@@ -166,11 +169,7 @@ def __init__(self, pattern, case_sensitive, accept_prefixes):
                 ] == "*":
                     asterik_len += 1
                 if asterik_len > 2:
-                    raise ValueError(
-                        pattern
-                        + " is not a valid wildcard pattern. "
-                        + "(sequence of three or more *)"
-                    )
+                    raise PatternError(pattern, i + 2)
                 self.tokens.append(_PatternMatcherToken("*" * asterik_len))
                 i += asterik_len
             else:
@@ -194,13 +193,21 @@ def _match(self, tokens, text):
         else:
             return self._match(tokens[1:], text[1:]) or self._match(tokens, text[1:])
 
+    def __repr__(self):
+        return make_repr(
+            "_PatternMatcher",
+            self.pattern,
+            case_sensitive=(self.case_sensitive, None),
+            accept_prefixes=(self.accept_prefixes, None),
+        )
+
 
 class _PatternMatcherToken:
     def __init__(self, token_str):
         self.token_str = token_str
 
     def __repr__(self):
-        return "_PatternMatcherToken (" + self.token_str + ")"
+        return "_PatternMatcherToken({!r})".format(self.token_str)
 
     def match(self, character, case_sensitive):
         if self.token_str[0] == "[":

tests/test_wildcard.py

@@ -35,6 +35,31 @@ def test_wildcard(self):
         self.assertTrue(wildcard.match("**.jpg", "foo/a.jpg"))
         self.assertTrue(wildcard.match("**", "foo/a.jpg"))
 
+    def test_wildcard_accept_prefix(self):
+        self.assertTrue(wildcard.match("*.py", "file", accept_prefix=True))
+        self.assertTrue(wildcard.match("????.py", "????", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py", "file.p", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py[co]", "file.p", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py[co]", "file.p", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py[!c]", "file.py", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py[^]", "file.py^", accept_prefix=True))
+
+        self.assertTrue(wildcard.match("*.jpg", "file.py", accept_prefix=True))
+        self.assertFalse(wildcard.match("toolong.py", "????.py", accept_prefix=True))
+        self.assertFalse(wildcard.match("file.pyc", "file.pyca", accept_prefix=True))
+        self.assertFalse(wildcard.match("file.py[co]", "file.pyx", accept_prefix=True))
+        self.assertFalse(wildcard.match("file.py[!o]", "file.pyo", accept_prefix=True))
+        self.assertTrue(wildcard.match("file.py[]", "f", accept_prefix=True))
+
+        self.assertTrue(wildcard.imatch("*.py", "FILE.p", accept_prefix=True))
+        self.assertTrue(wildcard.imatch("*.py", "file.", accept_prefix=True))
+
+        self.assertFalse(wildcard.match("foo*.jpg", "foo/", accept_prefix=True))
+        self.assertTrue(wildcard.match("foo**.jpg", "foo", accept_prefix=True))
+        self.assertTrue(wildcard.match("foo**", "foo/", accept_prefix=True))
+        self.assertTrue(wildcard.match("**.jpg", "foo", accept_prefix=True))
+        self.assertTrue(wildcard.match("**", "foo/a.j", accept_prefix=True))
+
     def test_match_any(self):
         self.assertTrue(wildcard.match_any([], "foo.py"))
         self.assertTrue(wildcard.imatch_any([], "foo.py"))