Fix magic/non-magic mix handling (#206)

* Fix magic/non-magic mix handling

Fixes #205

* Fix mypy

Author: facelessuser

docs/src/markdown/about/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.5.1
+
+- **FIX**: Fix handling of current directory when magic and non-magic patterns are mixed in `glob` pattern list.
+
 ## 8.5
 
 - **NEW**: Formally support Python 3.11 (no change).

tests/test_glob.py

@@ -1000,6 +1000,18 @@ def test_negateall_bytes(self):
         for file in glob.glob(b'!**/', flags=glob.N | glob.NEGATEALL | glob.G, root_dir=os.fsencode(self.tempdir)):
             self.assert_equal(os.path.isdir(file), False)
 
+    def test_magic_non_magic(self):
+        """Test logic when switching from magic to non-magic patterns."""
+
+        with change_cwd(self.tempdir):
+            self.assert_equal(sorted(glob.glob(['**/aab', 'dummy'], flags=glob.G)), ['aab',])
+
+    def test_non_magic_magic(self):
+        """Test logic when switching from non-magic to magic patterns."""
+
+        with change_cwd(self.tempdir):
+            self.assert_equal(sorted(glob.glob(['dummy', '**/aab'], flags=glob.G)), ['aab',])
+
 
 class TestGlobMarked(Testglob):
     """Test glob marked."""

tests/test_pathlib.py

@@ -340,10 +340,10 @@ def test_pickle(self):
         p3 = pickle.loads(pickle.dumps(p1))
         p4 = pickle.loads(pickle.dumps(p2))
 
-        self.assertTrue(type(p1) == type(p3))
-        self.assertTrue(type(p2) == type(p4))
-        self.assertTrue(type(p1) != type(p2))
-        self.assertTrue(type(p3) != type(p4))
+        self.assertTrue(type(p1) == type(p3))  # noqa: E721
+        self.assertTrue(type(p2) == type(p4))  # noqa: E721
+        self.assertTrue(type(p1) != type(p2))  # noqa: E721
+        self.assertTrue(type(p3) != type(p4))  # noqa: E721
 
 
 class TestExpansionLimit(unittest.TestCase):

wcmatch/__meta__.py

@@ -194,5 +194,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(8, 5, 0, "final")
+__version_info__ = Version(8, 5, 1, "final")
 __version__ = __version_info__._get_canonical()

wcmatch/glob.py

@@ -795,9 +795,9 @@ def format_path(self, path: AnyStr, is_dir: bool, dir_only: bool) -> Iterator[An
     def glob(self) -> Iterator[AnyStr]:
         """Starts off the glob iterator."""
 
-        curdir = self.current
-
         for pattern in self.pattern:
+            curdir = self.current
+
             # If the pattern ends with `/` we return the files ending with `/`.
             dir_only = pattern[-1].dir_only if pattern else False
             self.is_abs_pattern = pattern[0].is_drive if pattern else False

wcmatch/pathlib.py

@@ -113,7 +113,7 @@ def _translate_path(self) -> str:
 
         return name + sep
 
-    def match(
+    def match(  # type: ignore[override, unused-ignore]
         self,
         patterns: str | Sequence[str],
         *,