[javascriptlint-commit] SF.net SVN: javascriptlint: [165] trunk/setup.py

[<mat...@us...>]

Revision: 165
          http://javascriptlint.svn.sourceforge.net/javascriptlint/?rev=165&view=rev
Author:   matthiasmiller
Date:     2008-03-03 19:53:55 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
fix warnings in setup.py when py2exe isn't installed

Modified Paths:
--------------
    trunk/setup.py

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2008-03-04 03:42:17 UTC (rev 164)
+++ trunk/setup.py	2008-03-04 03:53:55 UTC (rev 165)
@@ -2,11 +2,6 @@
 from distutils.core import setup, Extension
 import os
 
-try:
-	import py2exe
-except ImportError:
-	pass
-
 # Add the bin directory to the module search path
 def get_lib_path():
 	import distutils.dist
@@ -28,21 +23,30 @@
 			libraries = [library],
 			sources = ['pyspidermonkey/pyspidermonkey.c']
 		)
-	setup(
+	args = {}
+	args.update(
 		name = 'pyjsl',
 		version = '1.0',
 		author = 'Matthias Miller',
 		author_email = 'in...@ja...',
 		url = 'http://www.javascriptlint.com/',
-		console = ['jsl.py'],
 		description = 'JavaScript Lint',
-		ext_modules = [pyspidermonkey],
-		options = {
-			'py2exe': {
-				'excludes': 'setup',
-				'bundle_files': 1
-			}
-		},
-		zipfile = None
+		ext_modules = [pyspidermonkey]
 	)
+	try:
+		import py2exe
+	except ImportError:
+		pass
+	else:
+		args.update(
+			console = ['jsl.py'],
+			options = {
+				'py2exe': {
+					'excludes': 'setup',
+					'bundle_files': 1
+				}
+			},
+			zipfile = None
+		)
+	setup(**args)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.