[Csp-commits] svn:csp r1242 - trunk/CSP/tools

[<sv...@ww...>]

Author: mkrose
Date: 2004-09-25 01:20:20 -0700 (Sat, 25 Sep 2004)
New Revision: 1242

Removed:
   trunk/CSP/tools/bootstrap.py
Modified:
   trunk/CSP/tools/pyrun
   trunk/CSP/tools/subset
   trunk/CSP/tools/trace
   trunk/CSP/tools/undiff
Log:
Remove explicit bootstrap module.  Use the CSP.py bootstrap
module installed by setup.py instead.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1242

Deleted: trunk/CSP/tools/bootstrap.py
===================================================================
--- trunk/CSP/tools/bootstrap.py	2004-09-25 05:11:06 UTC (rev 1241)
+++ trunk/CSP/tools/bootstrap.py	2004-09-25 08:20:20 UTC (rev 1242)
@@ -1,15 +0,0 @@
-import sys
-import os.path
-
-try:
-  import CSP
-except:
-  dn = os.path.dirname
-  root = dn(dn(dn(__file__)))
-  sys.path.insert(0, root)
-  try:
-    import CSP
-  except:
-    print 'Unable to import the main CSP module.  Check that you have'
-    print 'a complete working copy.'
-    sys.exit(1)

Modified: trunk/CSP/tools/pyrun
===================================================================
--- trunk/CSP/tools/pyrun	2004-09-25 05:11:06 UTC (rev 1241)
+++ trunk/CSP/tools/pyrun	2004-09-25 08:20:20 UTC (rev 1242)
@@ -37,7 +37,6 @@
 import zipfile
 from modulefinder import ModuleFinder
 
-import bootstrap
 from CSP.base import app
 
 

Modified: trunk/CSP/tools/subset
===================================================================
--- trunk/CSP/tools/subset	2004-09-25 05:11:06 UTC (rev 1241)
+++ trunk/CSP/tools/subset	2004-09-25 08:20:20 UTC (rev 1242)
@@ -30,10 +30,6 @@
 Run "%(prog)s help <command>" for help on a specific command.
 """
 
-
-# setup CSP
-import bootstrap
-
 from CSP.base import app
 from CSP.tools import subcmd
 

Modified: trunk/CSP/tools/trace
===================================================================
--- trunk/CSP/tools/trace	2004-09-25 05:11:06 UTC (rev 1241)
+++ trunk/CSP/tools/trace	2004-09-25 08:20:20 UTC (rev 1242)
@@ -48,8 +48,6 @@
 import re
 import os.path
 
-import bootstrap
-
 from CSP.base import app
 
 
@@ -245,7 +243,7 @@
 		input = sys.stdin.readlines()
 	except KeyboardInterrupt:
 		return 0
-	
+
 	dir = app.options.dir
 	stack_trace = StackTrace()
 	stack_trace.process(input, dir)

Modified: trunk/CSP/tools/undiff
===================================================================
--- trunk/CSP/tools/undiff	2004-09-25 05:11:06 UTC (rev 1241)
+++ trunk/CSP/tools/undiff	2004-09-25 08:20:20 UTC (rev 1242)
@@ -36,7 +36,6 @@
 import sys
 import os
 
-import bootstrap
 from CSP.base import app