[py-svn] r37077 - py/branch/config/py/test

[hpk at codespeak.net]

Author: hpk
Date: Sat Jan 20 22:26:52 2007
New Revision: 37077

Modified:
   py/branch/config/py/test/config.py
Log:
cleaning up fixoptions() a bit


Modified: py/branch/config/py/test/config.py
==============================================================================
--- py/branch/config/py/test/config.py	(original)
+++ py/branch/config/py/test/config.py	Sat Jan 20 22:26:52 2007
@@ -214,30 +214,22 @@
 
 def fixoptions(option):
     """ sanity checks and making option values canonical. """
-    if option.looponfailing and option.usepdb:
-        raise ValueError, "--looponfailing together with --pdb not supported yet."
-    if option.executable and option.usepdb:
-        raise ValueError, "--exec together with --pdb not supported yet."
-
-    # setting a correct executable
-    remote = False
-    #if option.executable is not None:
-    #    remote = True 
-    #    exe = py.path.local(py.std.os.path.expanduser(option.executable))
-    #    if not exe.check():
-    #        exe = py.path.local.sysfind(option.executable)
-    #    assert exe.check()
-    #    option.executable = exe
-    #else: 
-    #    option.executable = py.std.sys.executable 
 
+    # implied options
     if option.usepdb:
         if not option.nocapture:
-            print "--usepdb currently implies --nocapture"
+            print "--usepdb implies --nocapture"
             option.nocapture = True
-
-    # make information available about wether we should/will be remote 
     if option.runbrowser and not option.startserver:
-        #print "Cannot point browser when not starting server"
+        print "--runbrowser implies --startserver"
         option.startserver = True
-    # XXX: Shouldn't we fix the session here?
+
+    # conflicting options 
+    if option.looponfailing and option.usepdb:
+        raise ValueError, "--looponfailing together with --pdb not supported yet."
+    if option.looponfailing and option.dist:
+        raise ValueError, "--looponfailing together with --dist not supported yet."
+    if option.executable and option.usepdb:
+        raise ValueError, "--exec together with --pdb not supported yet."
+
+