mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 85503 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85503 | antoine.pitrou | 2010-10-15 00:11:44 +0200 (ven., 15 oct. 2010) | 2 lines

  More proper closing of files
........
This commit is contained in:
Antoine Pitrou 2010-10-14 22:14:36 +00:00
parent 3d400b7a58
commit ea5d827b72
7 changed files with 82 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/doctest.py
View file

@ -214,7 +214,8 @@ def _load_testfile(filename, package, module_relative, encoding):
# get_data() opens files as 'rb', so one must do the equivalent
# conversion as universal newlines would do.
return file_contents.replace(os.linesep, '\n'), filename
return open(filename, encoding=encoding).read(), filename
with open(filename, encoding=encoding) as f:
return f.read(), filename
def _indent(s, indent=4):
"""
@ -2503,7 +2504,8 @@ def debug_script(src, pm=False, globs=None):
if pm:
try:
exec(open(srcfilename).read(), globs, globs)
with open(srcfilename) as f:
exec(f.read(), globs, globs)
except:
print(sys.exc_info()[1])
pdb.post_mortem(sys.exc_info()[2])