merge 3.2

This commit is contained in:
Benjamin Peterson 2011-05-20 11:49:58 -05:00
commit 2ed7521e96
1 changed files with 1 additions and 1 deletions

View File

@ -1358,7 +1358,7 @@ Files and Directories
try:
fp = open("myfile")
except OSError as e:
except IOError as e:
if e.errno == errno.EACCESS:
return "some default data"
# Not a permission error.