mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-02 14:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in example (should close file at all times)

Browse Source
This commit is contained in:
Guido van Rossum 1995-07-07 23:01:27 +00:00
parent 6b686e94a1
commit d6ac380d39
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Doc/lib/libimp.tex
View File

@ -158,14 +158,17 @@ def __import__(name, globals=None, locals=None, fromlist=None):
fp, pathname, (suffix, mode, type) = imp.find_module(name) fp, pathname, (suffix, mode, type) = imp.find_module(name)
# See what we got. # See what we got.
# Note that fp will be closed automatically when we return. try:
if type == imp.C_EXTENSION: if type == imp.C_EXTENSION:
return imp.load_dynamic(name, pathname) return imp.load_dynamic(name, pathname)
if type == imp.PY_SOURCE: if type == imp.PY_SOURCE:
return imp.load_source(name, pathname, fp) return imp.load_source(name, pathname, fp)
if type == imp.PY_COMPILED: if type == imp.PY_COMPILED:
return imp.load_compiled(name, pathname, fp) return imp.load_compiled(name, pathname, fp)
# Shouldn't get here at all. # Shouldn't get here at all.
raise ImportError, '%s: unknown module type (%d)' % (name, type) raise ImportError, '%s: unknown module type (%d)' % (name, type)
finally:
# Since we may exit via an exception, close fp explicitly.
fp.close()
\end{verbatim} \end{verbatim}

21
Doc/libimp.tex
View File

@ -158,14 +158,17 @@ def __import__(name, globals=None, locals=None, fromlist=None):
fp, pathname, (suffix, mode, type) = imp.find_module(name) fp, pathname, (suffix, mode, type) = imp.find_module(name)
# See what we got. # See what we got.
# Note that fp will be closed automatically when we return. try:
if type == imp.C_EXTENSION: if type == imp.C_EXTENSION:
return imp.load_dynamic(name, pathname) return imp.load_dynamic(name, pathname)
if type == imp.PY_SOURCE: if type == imp.PY_SOURCE:
return imp.load_source(name, pathname, fp) return imp.load_source(name, pathname, fp)
if type == imp.PY_COMPILED: if type == imp.PY_COMPILED:
return imp.load_compiled(name, pathname, fp) return imp.load_compiled(name, pathname, fp)
# Shouldn't get here at all. # Shouldn't get here at all.
raise ImportError, '%s: unknown module type (%d)' % (name, type) raise ImportError, '%s: unknown module type (%d)' % (name, type)
finally:
# Since we may exit via an exception, close fp explicitly.
fp.close()
\end{verbatim} \end{verbatim}