mirror of
https://github.com/python/cpython.git
synced 2025-09-27 02:39:58 +00:00
Fix some name errors in Mac modules.
This commit is contained in:
parent
7e1902bced
commit
1f6176e794
3 changed files with 4 additions and 3 deletions
|
@ -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:
|
||||||
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):
|
||||||
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)
|
||||||
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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue