Fix issue when matching a file in the CWD (#17)

* Fix issue when matching a file in the CWD

* Is this causing bad coverage?

* Ignore warnings in pytest

* Update document typos

Author: facelessuser

docs/src/markdown/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.3
+
+- **FIX**: In `glob`, properly handle files in the current working directory when give a literal pattern that matches it.
+
 ## 2.0.2
 
 - **FIX**: `wcmatch` override events (`on_error` and `on_skip`) should verify the return  is **not None** and not **not falsy**.

docs/src/markdown/fnmatch.md

@@ -133,7 +133,7 @@ def translate(patterns, *, flags=0):
 
 #### fnmatch.RAWCHARS, fnmatch.R {: #fnmatchrawchars}
 
-`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handled standard string escapes and Unicode including `#!py3 r'\N{CHAR NAME}'`.
+`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handle standard string escapes and Unicode including `#!py3 r'\N{CHAR NAME}'`.
 
 #### fnmatch.NEGATE, fnmatch.N {: #fnmatchnegate}
 

docs/src/markdown/glob.md

@@ -252,7 +252,7 @@ True
 
 #### glob.RAWCHARS, glob.R {: #globrawchars}
 
-`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handled standard string escapes and Unicode including `#!py3 r'\N{CHAR NAME}'`.
+`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handle standard string escapes and Unicode including `#!py3 r'\N{CHAR NAME}'`.
 
 #### glob.NEGATE, glob.N {: #globnegate}
 

docs/src/markdown/wcmatch.md

@@ -228,7 +228,7 @@ On match returns the path of the matched file.  You can override `on_match` and
 
 #### wcmatch.RAWCHARS, wcmatch.R {: #wcmatchrawchars}
 
-`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handled standard string escapes and Unicode (including `#!py3 r'\N{CHAR NAME}'`).
+`RAWCHARS` causes string character syntax to be parsed in raw strings: `#!py3 r'\u0040'` --> `#!py3 r'@'`. This will handle standard string escapes and Unicode (including `#!py3 r'\N{CHAR NAME}'`).
 
 #### wcmatch.EXTMATCH, wcmatch.E {: #wcmatchextmatch}
 

tests/test_glob.py

@@ -755,6 +755,35 @@ def test_glob_cases(self, case):
         self.eval_glob_cases(case)
 
 
+class TestCWD(_TestGlob):
+    """Test files in the current working directory."""
+
+    @classmethod
+    def setup_fs(cls):
+        """Setup filesystem."""
+
+        cls.mktemp('a', 'D')
+        cls.mktemp('aab', 'F')
+        cls.mktemp('.aa', 'G')
+        cls.mktemp('.bb', 'H')
+        cls.mktemp('aaa', 'zzzF')
+        cls.mktemp('ZZZ')
+        cls.mktemp('EF')
+        cls.mktemp('a', 'bcd', 'EF')
+        cls.mktemp('a', 'bcd', 'efg', 'ha')
+        cls.can_symlink = can_symlink()
+        if cls.can_symlink:
+            os.symlink(cls.norm('broken'), cls.norm('sym1'))
+            os.symlink('broken', cls.norm('sym2'))
+            os.symlink(os.path.join('a', 'bcd'), cls.norm('sym3'))
+
+    def test_cwd(self):
+        """Test glob cases."""
+
+        with change_cwd(self.tempdir):
+            self.assert_equal(glob.glob('EF'), ['EF'])
+
+
 class TestGlobCornerCase(_TestGlob):
     """
     Some tests that need a very specific file set to test against for corner cases.

tox.ini

@@ -30,3 +30,6 @@ commands=
 [flake8]
 max-line-length=120
 ignore=D202,D203,D401,N802,N801,N803,N806,E741
+
+[pytest]
+addopts=-p no:warnings

wcmatch/__version__.py

@@ -1,7 +1,7 @@
 """Version."""
 
 #   (major, minor, micro, release type, pre-release build, post-release build)
-version_info = (2, 0, 2, 'final', 0, 0)
+version_info = (2, 0, 3, 'final', 0, 0)
 
 
 def _version():

wcmatch/glob.py

@@ -361,9 +361,11 @@ def glob(self):
                     # on a case sensitive file system may return more than
                     # one starting location.
                     results = [curdir] if this.is_drive else self._get_starting_paths(curdir)
-                    if not results:  # pragma: no cover
-                        # Nothing to do.
-                        # Do we need this?
+                    if not results:
+                        if not dir_only and os.path.lexists(curdir):
+                            # There is no directory with this name,
+                            # but we have a file and no directory restriction
+                            yield curdir
                         return
 
                     if this.dir_only: