Address #31

cpburnz · Jan 29, 2020 · 96f8cb5 · 96f8cb5
1 parent 9182980
commit 96f8cb5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,5 @@ pip-log.txt
 # Sublime Text file.
 *.sublime-project
 *.sublime-workspace
+
+*.iml
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,14 @@ Change History
 ==============
 
 
+0.8.0 (TDB)
+-----------
+
+- `Issue #31`_: match_tree doesn't return symlink.
+
+.. _`Issue #31`: https://github.com/cpburnz/python-path-specification/issues/31
+
+
 0.7.0 (2019-12-27)
 ------------------
 

diff --git a/pathspec/__init__.py b/pathspec/__init__.py
@@ -24,7 +24,7 @@
 from __future__ import unicode_literals
 
 __author__ = "Caleb P. Burns"
-__copyright__ = "Copyright © 2013-2018 Caleb P. Burns"
+__copyright__ = "Copyright © 2013-2020 Caleb P. Burns"
 __created__ = "2013-10-12"
 __credits__ = [
 	"dahlia <https://github.com/dahlia>",
@@ -46,12 +46,13 @@
 	"mroutis <https://github.com/mroutis>",
 	"jdufresne <https://github.com/jdufresne>",
 	"groodt <https://github.com/groodt>",
+	"ftrofin <https://github.com/ftrofin>",
 ]
 __email__ = "[email protected]"
 __license__ = "MPL 2.0"
 __project__ = "pathspec"
 __status__ = "Development"
-__updated__ = "2020-01-21"
+__updated__ = "2020-01-28"
 __version__ = "0.8.0.dev1"
 
 from .pathspec import PathSpec

diff --git a/pathspec/util.py b/pathspec/util.py
@@ -179,8 +179,8 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error, follow_links):
 			for file_rel in _iter_tree_next(root_full, node_rel, memo, on_error, follow_links):
 				yield file_rel
 
-		elif stat.S_ISREG(node_stat.st_mode):
-			# Child node is a file, yield it.
+		elif stat.S_ISREG(node_stat.st_mode) or is_link:
+			# Child node is a file or unfollowed link, yield it.
 			yield node_rel
 
 	# NOTE: Make sure to remove the canonical (real) path of the directory