merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-30 22:45:01 +01:00
commit 9ac894aeff
1 changed files with 0 additions and 4 deletions

View File

@ -173,10 +173,6 @@ Options: -v verbose (print all checked file names)
count = defaultdict(int) count = defaultdict(int)
for root, dirs, files in os.walk(path): for root, dirs, files in os.walk(path):
# ignore subdirs controlled by svn
if '.svn' in dirs:
dirs.remove('.svn')
# ignore subdirs in ignore list # ignore subdirs in ignore list
if abspath(root) in ignore: if abspath(root) in ignore:
del dirs[:] del dirs[:]