From 2142aa8f042a068d6fe00e014cafc7b0c746b919 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 6 Sep 2009 13:07:26 +0000 Subject: [PATCH] broken minimal merge... --- Lib/plat-mac/macresource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/plat-mac/macresource.py b/Lib/plat-mac/macresource.py index 52e3e89952..bb9e2d9410 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. -- 2.50.1