diff options
author | Brett Cannon <bcannon@gmail.com> | 2007-02-16 19:33:01 +0000 |
---|---|---|
committer | Brett Cannon <bcannon@gmail.com> | 2007-02-16 19:33:01 +0000 |
commit | 3821e2d210169cdd224effc13fe5d6152241f6f0 (patch) | |
tree | 4ececcc2bd482e6eb784c1caa9ab9cb724a3e046 /Lib/encodings | |
parent | 22d079b1f4b67180057aef098e5a3da292e1a842 (diff) | |
download | cpython-3821e2d210169cdd224effc13fe5d6152241f6f0.tar.gz |
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
Diffstat (limited to 'Lib/encodings')
-rw-r--r-- | Lib/encodings/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 190b3c4950..7db44cbc4e 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -93,10 +93,10 @@ def search_function(encoding): if not modname or '.' in modname: continue try: - # Import equivalent to `` from .modname import *``. - # '*' is used so that __import__ returns the desired module and not - # 'encodings' itself. - mod = __import__(modname, globals(), locals(), ['*'], 1) + # Import is absolute to prevent the possibly malicious import of a + # module with side-effects that is not in the 'encodings' package. + mod = __import__('encodings.' + modname, fromlist=_import_tail, + level=0) except ImportError: pass else: |