[Python-checkins] r78053 - in python/trunk/Lib/plat-mac: Carbon/MediaDescr.py bundlebuilder.py macostools.py

[georg.brandl]

Author: georg.brandl
Date: Sun Feb  7 00:54:43 2010
New Revision: 78053

Log:
Fix some name errors in Mac modules.

Modified:
   python/trunk/Lib/plat-mac/Carbon/MediaDescr.py
   python/trunk/Lib/plat-mac/bundlebuilder.py
   python/trunk/Lib/plat-mac/macostools.py

Modified: python/trunk/Lib/plat-mac/Carbon/MediaDescr.py
==============================================================================
--- python/trunk/Lib/plat-mac/Carbon/MediaDescr.py	(original)
+++ python/trunk/Lib/plat-mac/Carbon/MediaDescr.py	Sun Feb  7 00:54:43 2010
@@ -15,7 +15,7 @@
             data = data[:self.size]
         values = struct.unpack(self.fmt, data)
         if len(values) != len(self.names):
-            raise Error, ('Format length does not match number of names', descr)
+            raise Error, ('Format length does not match number of names')
         rv = {}
         for i in range(len(values)):
             name = self.names[i]
@@ -26,7 +26,7 @@
             rv[name] = value
         return rv
 
-    def encode(dict):
+    def encode(self, dict):
         list = [self.fmt]
         for name in self.names:
             if type(name) == type(()):

Modified: python/trunk/Lib/plat-mac/bundlebuilder.py
==============================================================================
--- python/trunk/Lib/plat-mac/bundlebuilder.py	(original)
+++ python/trunk/Lib/plat-mac/bundlebuilder.py	Sun Feb  7 00:54:43 2010
@@ -432,7 +432,7 @@
             pass
         elif self.mainprogram is not None:
             self.name = os.path.splitext(os.path.basename(self.mainprogram))[0]
-        elif executable is not None:
+        elif self.executable is not None:
             self.name = os.path.splitext(os.path.basename(self.executable))[0]
         if self.name[-4:] != ".app":
             self.name += ".app"

Modified: python/trunk/Lib/plat-mac/macostools.py
==============================================================================
--- python/trunk/Lib/plat-mac/macostools.py	(original)
+++ python/trunk/Lib/plat-mac/macostools.py	Sun Feb  7 00:54:43 2010
@@ -10,6 +10,7 @@
 from Carbon import Res
 from Carbon import File, Files
 import os
+import errno
 import MacOS
 try:
     openrf = MacOS.openrf