Merged revisions 74672 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74672 | ronald.oussoren | 2009-09-06 12:00:26 +0200 (Sun, 06 Sep 2009) | 1 line
Fix build issues on OSX 10.6 (issue 6802)
........
diff --git a/Mac/scripts/BuildApplet.py b/Mac/scripts/BuildApplet.py
index e71ebc1..eeeb82b 100644
--- a/Mac/scripts/BuildApplet.py
+++ b/Mac/scripts/BuildApplet.py
@@ -12,7 +12,10 @@
import os
import MacOS
-import EasyDialogs
+try:
+ import EasyDialogs
+except ImportError:
+ EasyDialogs = None
import buildtools
import getopt
@@ -32,7 +35,10 @@
try:
buildapplet()
except buildtools.BuildError, detail:
- EasyDialogs.Message(detail)
+ if EasyDialogs is None:
+ print detail
+ else:
+ EasyDialogs.Message(detail)
def buildapplet():
@@ -46,6 +52,10 @@
# Ask for source text if not specified in sys.argv[1:]
if not sys.argv[1:]:
+ if EasyDialogs is None:
+ usage()
+ sys.exit(1)
+
filename = EasyDialogs.AskFileForOpen(message='Select Python source or applet:',
typeList=('TEXT', 'APPL'))
if not filename: