From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 2 Aug 2002 14:04:15 +0000 (+0000)
Subject: - Slightly better error message in case of syntax errors in the script.
X-Git-Tag: v2.3c1~4787
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eb4b18f94efbc78818cbc1a21f88bd916b2e6d8;p=python

- Slightly better error message in case of syntax errors in the script.
- The applet .rsrc file should be called python.rsrc, it is not based on the
  applet name.
---

diff --git a/Mac/Lib/buildtools.py b/Mac/Lib/buildtools.py
index efc5c47edd..982570855b 100644
--- a/Mac/Lib/buildtools.py
+++ b/Mac/Lib/buildtools.py
@@ -83,8 +83,10 @@ def process(template, filename, destname, copy_codefragment,
 	fp.close()
 	try:
 		code = compile(text, filename, "exec")
-	except (SyntaxError, EOFError):
-		raise BuildError, "Syntax error in script %s" % `filename`
+	except SyntaxError, arg:
+		raise BuildError, "Syntax error in script %s: %s" % (filename, arg)
+	except EOFError:
+		raise BuildError, "End-of-file in script %s" % (filename,)
 	
 	# Set the destination file name. Note that basename
 	# does contain the whole filepath, only a .py is stripped.
@@ -341,7 +343,7 @@ def process_common_macho(template, progress, code, rsrcname, destname, is_update
 	if progress:
 		progress.label("Copy resources...")
 		progress.set(20)
-	resfilename = '%s.rsrc' % shortname
+	resfilename = 'python.rsrc'  # XXXX later: '%s.rsrc' % shortname
 	try:
 		output = Res.FSOpenResourceFile(
 				os.path.join(destname, 'Contents', 'Resources', resfilename),