Kaydet (Commit) 1f6176e7 authored tarafından Georg Brandl's avatar Georg Brandl

Fix some name errors in Mac modules.

üst 7e1902bc
...@@ -15,7 +15,7 @@ class _MediaDescriptionCodec: ...@@ -15,7 +15,7 @@ class _MediaDescriptionCodec:
data = data[:self.size] data = data[:self.size]
values = struct.unpack(self.fmt, data) values = struct.unpack(self.fmt, data)
if len(values) != len(self.names): 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 = {} rv = {}
for i in range(len(values)): for i in range(len(values)):
name = self.names[i] name = self.names[i]
...@@ -26,7 +26,7 @@ class _MediaDescriptionCodec: ...@@ -26,7 +26,7 @@ class _MediaDescriptionCodec:
rv[name] = value rv[name] = value
return rv return rv
def encode(dict): def encode(self, dict):
list = [self.fmt] list = [self.fmt]
for name in self.names: for name in self.names:
if type(name) == type(()): if type(name) == type(()):
......
...@@ -432,7 +432,7 @@ class AppBuilder(BundleBuilder): ...@@ -432,7 +432,7 @@ class AppBuilder(BundleBuilder):
pass pass
elif self.mainprogram is not None: elif self.mainprogram is not None:
self.name = os.path.splitext(os.path.basename(self.mainprogram))[0] 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] self.name = os.path.splitext(os.path.basename(self.executable))[0]
if self.name[-4:] != ".app": if self.name[-4:] != ".app":
self.name += ".app" self.name += ".app"
......
...@@ -10,6 +10,7 @@ warnpy3k("In 3.x, the macostools module is removed.", stacklevel=2) ...@@ -10,6 +10,7 @@ warnpy3k("In 3.x, the macostools module is removed.", stacklevel=2)
from Carbon import Res from Carbon import Res
from Carbon import File, Files from Carbon import File, Files
import os import os
import errno
import MacOS import MacOS
try: try:
openrf = MacOS.openrf openrf = MacOS.openrf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment