Fix relative path resolution in pathlib (#82)

* Fix relative path resolution in pathlib

* Add test

Author: facelessuser

docs/src/markdown/changelog.md

@@ -3,6 +3,7 @@
 ## 5.0.2
 
 - **FIX**: Fix case where a `GLOBSTAR` pattern, followed by a slash, was not disabling `MATCHBASE`.
+- **FIX**: Fix `pathlib` relative path resolution in glob implementations.
 
 ## 5.0.1
 

tests/test_pathlib.py

@@ -1,10 +1,39 @@
 """Test `pathlib`."""
+import contextlib
 import pytest
 import unittest
 import os
 from wcmatch import pathlib, glob
 import pathlib as pypathlib
 import pickle
+import warnings
+
+
+@contextlib.contextmanager
+def change_cwd(path, quiet=False):
+    """
+    Return a context manager that changes the current working directory.
+
+    Arguments:
+      path: the directory to use as the temporary current working directory.
+      quiet: if False (the default), the context manager raises an exception
+        on error.  Otherwise, it issues only a warning and keeps the current
+        working directory the same.
+
+    """
+
+    saved_dir = os.getcwd()
+    try:
+        os.chdir(path)
+    except OSError:
+        if not quiet:
+            raise
+        warnings.warn('tests may fail, unable to change CWD to: ' + path,
+                      RuntimeWarning, stacklevel=3)
+    try:
+        yield os.getcwd()
+    finally:
+        os.chdir(saved_dir)
 
 
 class TestGlob(unittest.TestCase):
@@ -16,6 +45,16 @@ class TestGlob(unittest.TestCase):
 
     """
 
+    def test_relative(self):
+        """Test relative path."""
+
+        abspath = os.path.abspath('.')
+        p = pathlib.Path(abspath)
+        with change_cwd(os.path.dirname(abspath)):
+            results = list(p.glob('docs/**/*.md', flags=pathlib.GLOBSTAR))
+        self.assertTrue(len(results))
+        self.assertTrue(all([file.suffix == '.md' for file in results]))
+
     def test_glob(self):
         """Test globbing function."""
 

wcmatch/__meta__.py

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

wcmatch/glob.py

@@ -112,7 +112,7 @@ def __init__(self, pattern, flags=0, curdir=None):
 
         self.is_bytes = isinstance(pattern[0], bytes)
         self.current = b'.' if self.is_bytes else '.'
-        self.curdir = curdir
+        self.curdir = curdir if curdir is not None else self.current
         self.mark = bool(flags & MARK)
         if self.mark:
             flags ^= MARK
@@ -228,7 +228,7 @@ def _get_matcher(self, target):
     def _iter(self, curdir, dir_only, deep):
         """Iterate the directory."""
 
-        scandir = self.current if not curdir else curdir
+        scandir = self.curdir if not curdir else curdir
 
         # Python will never return . or .., so fake it.
         for special in self.specials:
@@ -381,7 +381,7 @@ def _glob(self, curdir, this, rest):
                 else:
                     yield path, is_dir
 
-    def _get_starting_paths(self, curdir, dir_only):
+    def _get_starting_paths(self, curdir, dir_only, base):
         """
         Get the starting location.
 
@@ -394,14 +394,19 @@ def _get_starting_paths(self, curdir, dir_only):
         results = [(curdir, True)]
 
         if not self._is_parent(curdir) and not self._is_this(curdir):
-            fullpath = os.path.abspath(curdir)
+            fullpath = os.path.abspath(os.path.join(base, curdir))
             basename = os.path.basename(fullpath)
             dirname = os.path.dirname(fullpath)
             if basename:
                 matcher = self._get_matcher(basename)
-                results = [
-                    (os.path.basename(name), is_dir) for name, is_dir in self._glob_dir(dirname, matcher, dir_only)
-                ]
+                if base not in ('.', b'.'):
+                    results = [
+                        (name, is_dir) for name, is_dir in self._glob_dir(dirname, matcher, dir_only)
+                    ]
+                else:
+                    results = [
+                        (os.path.basename(name), is_dir) for name, is_dir in self._glob_dir(dirname, matcher, dir_only)
+                    ]
 
         return results
 
@@ -414,9 +419,10 @@ def glob(self):
         """Starts off the glob iterator."""
 
         if self.is_bytes:
-            curdir = os.fsencode(os.curdir) if self.curdir is None else self.curdir
+            curdir = self.curdir
         else:
-            curdir = os.curdir if self.curdir is None else self.curdir
+            curdir = self.curdir
+        base = curdir
 
         for pattern in self.pattern:
             # If the pattern ends with `/` we return the files ending with `/`.
@@ -431,13 +437,13 @@ def glob(self):
                     curdir = this[0]
 
                     # Abort if we cannot find the drive, or if current directory is empty
-                    if not curdir or (this.is_drive and not os.path.lexists(curdir)):
+                    if not curdir or (this.is_drive and not os.path.lexists(os.path.join(base, curdir))):
                         continue
 
                     # Make sure case matches, but running case insensitive
                     # on a case sensitive file system may return more than
                     # one starting location.
-                    results = [(curdir, True)] if this.is_drive else self._get_starting_paths(curdir, dir_only)
+                    results = [(curdir, True)] if this.is_drive else self._get_starting_paths(curdir, dir_only, base)
                     if not results:
                         continue