Merge remote-tracking branch 'origin/master' into errors-dry

Conflicts:
	pep257.py

Author: Nurdok

README.rst

@@ -35,5 +35,19 @@ Run
     ...
 
 
-`Read the full documentation here <http://pep257.readthedocs.org>`_.
+Links
+-----
+
+.. image:: https://travis-ci.org/GreenSteam/pep257.svg?branch=master
+    :target: https://travis-ci.org/GreenSteam/pep257
+
+.. image:: https://readthedocs.org/projects/pep257/badge/?version=latest
+    :target: https://readthedocs.org/projects/pep257/?badge=latest
+    :alt: Documentation Status
+
+* `Read the full documentation here <http://pep257.readthedocs.org>`_.
+
+* `Fork pep257 on GitHub <http://github.com/GreenSteam/pep257>`_.
+
+* `PyPI project page <https://pypi.python.org/pypi/pep257>`_.
 

pep257.py

@@ -584,9 +584,8 @@ def collect(names, match=lambda name: True, match_dir=lambda name: True):
     for name in names:  # map(expanduser, names):
         if os.path.isdir(name):
             for root, dirs, filenames in os.walk(name):
-                for dir in dirs:
-                    if not match_dir(dir):
-                        dirs.remove(dir)  # do not visit those dirs
+                # Skip any dirs that do not match match_dir
+                dirs[:] = [dir for dir in dirs if match_dir(dir)]
                 for filename in filenames:
                     if match(filename):
                         yield os.path.join(root, filename)
@@ -882,8 +881,8 @@ def check_indent(self, definition, docstring):
                 indents = [leading_space(l) for l in lines if not is_blank(l)]
                 if set(' \t') == set(''.join(indents) + indent):
                     yield D206()
-                if (len(indents) > 1 and min(indents[:-1]) > indent
-                        or indents[-1] > indent):
+                if (len(indents) > 1 and min(indents[:-1]) > indent or
+                        indents[-1] > indent):
                     yield D208()
                 if min(indents) < indent:
                     yield D207()