doh! revert 12077

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@12078 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
boxed · Oct 18, 2004 · 36c7945 · 36c7945
1 parent f1c7775
commit 36c7945
Show file tree

Hide file tree

Showing 34 changed files with 1,450 additions and 4,513 deletions.
diff --git a/LICENSE b/LICENSE
@@ -10,7 +10,6 @@ Donovan Preston
 Itamar Shtull-Trauring
 James Knight
 Jonathan Lange
-Jonathan D. Simms
 Jp Calderone
 J�rgen Hermann
 Kevin Turner

diff --git a/bin/trial b/bin/trial
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/env python
 
 # Twisted, the Framework of Your Internet
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
@@ -12,8 +12,8 @@
 import sys, os, string
 if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
-if hasattr(os, "getuid") and os.getuid() != 0:
-    sys.path.insert(0, os.curdir)
+if not hasattr(os, "getuid") or os.getuid() != 0:
+    sys.path.insert(0, os.getcwd())
 ### end of preamble
 
 # begin chdir armor

diff --git a/sandbox/slyphon/hotshot2kcachegrind.py b/sandbox/slyphon/hotshot2kcachegrind.py
diff --git a/twisted/application/app.py b/twisted/application/app.py
@@ -31,7 +31,7 @@ def installReactor(reactor):
 
 def runWithProfiler(reactor, config):
     """Run reactor under standard profiler."""
-    p = profile.Profile(lineevents=1) # lineevents=1 for hotshot2kcachegrind compatability
+    p = profile.Profile()
     p.runcall(reactor.run)
     if config['savestats']:
         p.dump_stats(config['profile'])