Better 10.5 compatibility - not all the way there yet

lightningbeam.py

@@ -3,7 +3,11 @@
 # © 2012 Skyler Lehmkuhl
 # Released under the GPLv3. For more information, see gpl.txt.
 
-import os, shutil, tarfile, tempfile, StringIO, urllib, subprocess
+import os, shutil, tarfile, tempfile, StringIO, urllib, subprocess, sys
+
+if sys.version_info < (2, 6):
+	# Python 2.5
+	from __future__ import with_statement
 
 # Workaround for broken menubar under Ubuntu
 os.putenv("UBUNTU_MENUPROXY", "0")
@@ -344,11 +348,11 @@ def run_file(self=None):
 				svlgui.alert("Aborting.")
 				return
 			else:
-				svlgui.alert("The file will download when you click Ok.\nThis may take some time.")
+				svlgui.alert("The Flash Debugger will download when you click Ok.\nThis may take some time.")
 				urllib.urlretrieve("http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.app.zip", "fp.app.zip")
 				# Unzip the file. Apparently ditto is better for OSX apps than unzip.
 				os.system('ditto -V -x -k --sequesterRsrc --rsrc fp.app.zip .')
-				shutil.move('Flash Player Debugger.app', '/Applications')
+				shutil.move('Flash Player Debugger.app', '/Applications/Flash Player Debugger.app')
 				# Generally it is not recognized until it is opened
 				os.system('open -a "/Applications/Flash Player Debugger.app"')
 				# Set Flash Player Debugger as the default app for .swf files

svlgui.py

@@ -216,7 +216,7 @@ if sys.platform=="linux2":
 		from GUI import GL
 		try:
 			from PIL import Image as PILImage
-		except ImportError as err:
+		except ImportError:
 			import Image as PILImage
 	from GUI.Geometry import offset_rect, rect_sized
 	
@@ -257,7 +257,7 @@ elif sys.platform=="win32":
 		from GUI import GL
 		try:
 			from PIL import Image as PILImage
-		except ImportError as err:
+		except ImportError:
 			import Image as PILImage
 	media_path = ""
 	SYSTEM="osx"
@@ -297,7 +297,7 @@ elif sys.platform=="darwin":
 		from GUI import GL
 		try:
 			from PIL import Image as PILImage
-		except ImportError as err:
+		except ImportError:
 			import Image as PILImage
 	SYSTEM="osx"
 	'''
@@ -2735,7 +2735,7 @@ class Group (object):
 class TemporaryGroup(Group):
 	"""Created when selecting multiple items, for ease of use."""
 	def __init__(self, *args, **kwargs):
-		super(TemporaryGroup, self).__init__(*args, **kwargs)
+		(TemporaryGroup, self).__init__(*args, **kwargs)
 	# def draw(self, cr=None, transform=None, rect=None):
 	# 	super(TemporaryGroup, self).draw(cr, transform, rect)
 	# 	print self.x, self.activelayer.x