cpython: 4e80a157ea66 (original) (raw)

Mercurial > cpython

changeset 103400:4e80a157ea66

Revert #27959: ImportError within an encoding module should also skip the encoding [#27959]

Steve Dower steve.dower@microsoft.com
date	Fri, 09 Sep 2016 08:56:37 -0700
parents	f8340e2991e9
children	801634d3c105
files	Lib/encodings/__init__.py
diffstat	1 files changed, 4 insertions(+), 3 deletions(-)[+] [-] Lib/encodings/__init__.py 7

line wrap: on

line diff

--- a/Lib/encodings/init.py +++ b/Lib/encodings/init.py @@ -98,9 +98,10 @@ def search_function(encoding): # module with side-effects that is not in the 'encodings' package. mod = import('encodings.' + modname, fromlist=_import_tail, level=0)

   except ModuleNotFoundError as ex:[](#l1.7)

       if ex.name != 'encodings.' + modname:[](#l1.8)

```
           raise[](#l1.9)
```

```
   except ImportError:[](#l1.10)
```

       # ImportError may occur because 'encodings.(modname)' does not exist,[](#l1.11)

       # or because it imports a name that does not exist (see mbcs and oem)[](#l1.12)

       pass[](#l1.13)
   else:[](#l1.14)
       break[](#l1.15)

else: