summaryrefslogtreecommitdiffstats
path: root/Lib/plat-mac
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 23:54:43 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 23:54:43 (GMT)
commit1f6176e794a2600a48ca6a3e78b6e49c0577177f (patch)
treed936700c13e8d65c4f2f48d48ca958da50dcf941 /Lib/plat-mac
parent7e1902bced615e3a1a88f01c5fd899602301043a (diff)
downloadcpython-1f6176e794a2600a48ca6a3e78b6e49c0577177f.zip
cpython-1f6176e794a2600a48ca6a3e78b6e49c0577177f.tar.gz
cpython-1f6176e794a2600a48ca6a3e78b6e49c0577177f.tar.bz2
Fix some name errors in Mac modules.
Diffstat (limited to 'Lib/plat-mac')
-rw-r--r--Lib/plat-mac/Carbon/MediaDescr.py4
-rwxr-xr-xLib/plat-mac/bundlebuilder.py2
-rw-r--r--Lib/plat-mac/macostools.py1
3 files changed, 4 insertions, 3 deletions
diff --git a/Lib/plat-mac/Carbon/MediaDescr.py b/Lib/plat-mac/Carbon/MediaDescr.py
index 254634b..5431d1e 100644
--- a/Lib/plat-mac/Carbon/MediaDescr.py
+++ b/Lib/plat-mac/Carbon/MediaDescr.py
@@ -15,7 +15,7 @@ class _MediaDescriptionCodec:
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 @@ class _MediaDescriptionCodec:
rv[name] = value
return rv
- def encode(dict):
+ def encode(self, dict):
list = [self.fmt]
for name in self.names:
if type(name) == type(()):
diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py
index 7a71051..d13403c 100755
--- a/Lib/plat-mac/bundlebuilder.py
+++ b/Lib/plat-mac/bundlebuilder.py
@@ -432,7 +432,7 @@ class AppBuilder(BundleBuilder):
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"
diff --git a/Lib/plat-mac/macostools.py b/Lib/plat-mac/macostools.py
index 337cc7f..395001d 100644
--- a/Lib/plat-mac/macostools.py
+++ b/Lib/plat-mac/macostools.py
@@ -10,6 +10,7 @@ warnpy3k("In 3.x, the macostools module is removed.", stacklevel=2)
from Carbon import Res
from Carbon import File, Files
import os
+import errno
import MacOS
try:
openrf = MacOS.openrf