From: Just van Rossum <just@letterror.com>
Date: Thu, 10 Jul 2003 14:53:27 +0000 (+0000)
Subject: Fixed a bug that's been there from the beginning but wasn't noticed
X-Git-Tag: v2.3c1~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed8bfce0028ecd7e7c3b778f70b24d8d03809a05;p=thirdparty%2FPython%2Fcpython.git

Fixed a bug that's been there from the beginning but wasn't noticed
until now: the inheritance of default values was the wrong way around.
This caused app bundles to get a type of "BNDL" instead of "APPL".
Apparently this is not a problem until you try to drag your app to
the dock.
----------------------------------------------------------------------
---

diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py
index 1c786b88576d..09b9deae4a5a 100755
--- a/Lib/plat-mac/bundlebuilder.py
+++ b/Lib/plat-mac/bundlebuilder.py
@@ -54,13 +54,13 @@ class Defaults:
 
     def _getDefaults(cls):
         defaults = {}
+        for base in cls.__bases__:
+            if hasattr(base, "_getDefaults"):
+                defaults.update(base._getDefaults())
         for name, value in cls.__dict__.items():
             if name[0] != "_" and not isinstance(value,
                     (function, classmethod)):
                 defaults[name] = deepcopy(value)
-        for base in cls.__bases__:
-            if hasattr(base, "_getDefaults"):
-                defaults.update(base._getDefaults())
         return defaults
     _getDefaults = classmethod(_getDefaults)