Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

broken minimal merge...

This commit is contained in:
Ronald Oussoren 2009-09-06 13:07:26 +00:00
parent 796550559a
commit 2142aa8f04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/plat-mac/macresource.py
View File

@ -107,7 +107,7 @@ def resource_pathname(pathname, verbose=0):
refno = Res.FSpOpenResFile(pathname, 1) refno = Res.FSpOpenResFile(pathname, 1)
Res.CloseResFile(refno) Res.CloseResFile(refno)
except (AttributeError, Res.Error), arg: except (AttributeError, Res.Error), arg:
if instance(arg, AttributeError), or arg[0] in (-37, -39): if isinstance(arg, AttributeError) or arg[0] in (-37, -39):
# No resource fork. We may be on OSX, and this may be either # No resource fork. We may be on OSX, and this may be either
# a data-fork based resource file or a AppleSingle file # a data-fork based resource file or a AppleSingle file
# from the CVS repository. # from the CVS repository.