Merge 3.2: Issue #7732: Don't open a directory as a file anymore while

importing a module. Ignore the direcotry if its name matchs the module name
(e.g.  "__init__.py") and raise a ImportError instead.