Merge remote-tracking branch 'matt/patch-1' into develop

Conflicts:
	pip/req.py
This commit is contained in:
Matt Good 2014-03-27 22:46:19 -07:00 committed by Matt Good
commit 30978a9bf3
1 changed files with 1 additions and 1 deletions

View File

@ -401,7 +401,7 @@ exec(compile(
)):
dirs.remove(dir)
# Also don't search through tests
if dir == 'test' or dir == 'tests':
elif dir == 'test' or dir == 'tests':
dirs.remove(dir)
filenames.extend([os.path.join(root, dir)
for dir in dirs])