Merge #12295 fix from 3.2

This commit is contained in:
Éric Araujo 2011-08-01 17:31:12 +02:00
commit eec1ed8119
1 changed files with 3 additions and 2 deletions

View File

@ -62,14 +62,15 @@ def view_text(parent, title, text):
def view_file(parent, title, filename, encoding=None):
try:
textFile = open(filename, 'r', encoding=encoding)
with open(filename, 'r', encoding=encoding) as file:
contents = file.read()
except IOError:
import tkinter.messagebox as tkMessageBox
tkMessageBox.showerror(title='File Load Error',
message='Unable to load file %r .' % filename,
parent=parent)
else:
return view_text(parent, title, textFile.read())
return view_text(parent, title, contents)
if __name__ == '__main__':