diff options
| author |   Ned Deily <nad@acm.org> | 2011-10-06 14:24:31 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-10-06 14:24:31 -0700 |
| commit | 94030712770513a26bbe80346168b340dc6a16f3 (patch) | |
| tree | c914f1293ea51c570b92b7450849ecd1316f0e6d /Lib/pkgutil.py | |
| parent | fix compiler warnings (diff) | |
| parent | Issue #7367: Fix pkgutil.walk_paths to skip directories whose (diff) | |
| download | cpython-94030712770513a26bbe80346168b340dc6a16f3.tar.gz cpython-94030712770513a26bbe80346168b340dc6a16f3.tar.bz2 cpython-94030712770513a26bbe80346168b340dc6a16f3.zip | |
merge from 3.2
Diffstat (limited to 'Lib/pkgutil.py')
| -rw-r--r-- | Lib/pkgutil.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index c561c1382df..bdea23eb3f2 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -191,8 +191,11 @@ class ImpImporter: yielded = {} import inspect - - filenames = os.listdir(self.path) + try: + filenames = os.listdir(self.path) + except OSError: + # ignore unreadable directories like import does + filenames = [] filenames.sort() # handle packages before same-named modules for fn in filenames: @@ -205,7 +208,12 @@ class ImpImporter: if not modname and os.path.isdir(path) and '.' not in fn: modname = fn - for fn in os.listdir(path): + try: + dircontents = os.listdir(path) + except OSError: + # ignore unreadable directories like import does + dircontents = [] + for fn in dircontents: subname = inspect.getmodulename(fn) if subname=='__init__': ispkg = True |