Merge 3.5, issue #14209

This commit is contained in:
Łukasz Langa 2016-06-11 18:05:42 -07:00
commit 34ad2ef8f9
3 changed files with 81 additions and 4 deletions

View file

@ -375,7 +375,7 @@ try:
if len(fn)==2 and fn[1].startswith('__init__.py'):
if fn[0] not in yielded:
yielded[fn[0]] = 1
yield fn[0], True
yield prefix + fn[0], True
if len(fn)!=1:
continue