diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-06 13:07:26 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-06 13:07:26 (GMT) |
| commit | 2142aa8f042a068d6fe00e014cafc7b0c746b919 (patch) | |
| tree | f3dd6c63f5db560636f32deb95ded9d8754a20d1 | |
| parent | 796550559a8c4fbf7b917234ccc47bfd4a048938 (diff) | |
| download | cpython-2142aa8f042a068d6fe00e014cafc7b0c746b919.zip cpython-2142aa8f042a068d6fe00e014cafc7b0c746b919.tar.gz cpython-2142aa8f042a068d6fe00e014cafc7b0c746b919.tar.bz2 | |
broken minimal merge...
| -rw-r--r-- | Lib/plat-mac/macresource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/plat-mac/macresource.py b/Lib/plat-mac/macresource.py index 52e3e89..bb9e2d9 100644 --- a/Lib/plat-mac/macresource.py +++ b/Lib/plat-mac/macresource.py @@ -107,7 +107,7 @@ def resource_pathname(pathname, verbose=0): refno = Res.FSpOpenResFile(pathname, 1) Res.CloseResFile(refno) 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 # a data-fork based resource file or a AppleSingle file # from the CVS repository. |