[pypy-svn] r36260 - in pypy/dist/pypy: lang/js/test translator/cl translator/cli translator/js/test translator/jvm translator/llvm translator/squeak/test

[afayolle at codespeak.net]

Author: afayolle
Date: Mon Jan  8 13:35:13 2007
New Revision: 36260

Modified:
   pypy/dist/pypy/lang/js/test/test_interp.py
   pypy/dist/pypy/translator/cl/buildcl.py
   pypy/dist/pypy/translator/cli/sdk.py
   pypy/dist/pypy/translator/js/test/runtest.py
   pypy/dist/pypy/translator/jvm/genjvm.py
   pypy/dist/pypy/translator/llvm/buildllvm.py
   pypy/dist/pypy/translator/squeak/test/runtest.py
Log:
updated sysfind usage to new smeantics. 


Modified: pypy/dist/pypy/lang/js/test/test_interp.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/test_interp.py	(original)
+++ pypy/dist/pypy/lang/js/test/test_interp.py	Mon Jan  8 13:35:13 2007
@@ -11,9 +11,7 @@
 
 
 def js_is_on_path():
-    try:
-        py.path.local.sysfind("js")
-    except py.error.ENOENT: 
+    if py.path.local.sysfind("js") is None:
         py.test.skip("js binary not found")
 
 js_is_on_path()

Modified: pypy/dist/pypy/translator/cl/buildcl.py
==============================================================================
--- pypy/dist/pypy/translator/cl/buildcl.py	(original)
+++ pypy/dist/pypy/translator/cl/buildcl.py	Mon Jan  8 13:35:13 2007
@@ -11,12 +11,9 @@
 global_cl = None
 
 def is_on_path(name):
-    try:
-        py.path.local.sysfind(name)
-    except py.error.ENOENT:
+    if py.path.local.sysfind(name) is None:
         return False
-    else:
-        return True
+    return True
 
 def cl_detect():
     cl = os.getenv("PYPY_CL")

Modified: pypy/dist/pypy/translator/cli/sdk.py
==============================================================================
--- pypy/dist/pypy/translator/cli/sdk.py	(original)
+++ pypy/dist/pypy/translator/cli/sdk.py	Mon Jan  8 13:35:13 2007
@@ -3,11 +3,10 @@
 
 class AbstractSDK(object):
     def _check_helper(cls, helper):
-        try:
-            py.path.local.sysfind(helper)
-            return helper
-        except py.error.ENOENT:
+        if py.path.local.sysfind(helper) is None:
             py.test.skip("%s is not on your path." % helper)
+        else:
+            return helper
     _check_helper = classmethod(_check_helper)
 
     def runtime(cls):

Modified: pypy/dist/pypy/translator/js/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/runtest.py	(original)
+++ pypy/dist/pypy/translator/js/test/runtest.py	Mon Jan  8 13:35:13 2007
@@ -24,9 +24,7 @@
 port = 8080
 
 def _CLI_is_on_path():
-    try:
-        py.path.local.sysfind('js') #we recommend Spidermonkey
-    except py.error.ENOENT:
+    if py.path.local.sysfind('js') is None:  #we recommend Spidermonkey
         return False
     return True
 

Modified: pypy/dist/pypy/translator/jvm/genjvm.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/genjvm.py	(original)
+++ pypy/dist/pypy/translator/jvm/genjvm.py	Mon Jan  8 13:35:13 2007
@@ -160,9 +160,7 @@
 
 def detect_missing_support_programs():
     def check(exechelper):
-        try:
-            py.path.local.sysfind(exechelper)
-        except py.error.ENOENT:
+        if py.path.local.sysfind(exechelper) is None:
             py.test.skip("%s is not on your path" % exechelper)
     check(getoption('jasmin'))
     check(getoption('javac'))

Modified: pypy/dist/pypy/translator/llvm/buildllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/buildllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/buildllvm.py	Mon Jan  8 13:35:13 2007
@@ -10,10 +10,8 @@
 import distutils.sysconfig
 
 def llvm_is_on_path():
-    try:
-        py.path.local.sysfind("llvm-as")
-        py.path.local.sysfind("llvm-gcc")
-    except py.error.ENOENT: 
+    if py.path.local.sysfind("llvm-as") is None or \
+       py.path.local.sysfind("llvm-gcc") is None:
         return False 
     return True
 

Modified: pypy/dist/pypy/translator/squeak/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/test/runtest.py	(original)
+++ pypy/dist/pypy/translator/squeak/test/runtest.py	Mon Jan  8 13:35:13 2007
@@ -14,9 +14,7 @@
         import posix
     except ImportError:
         py.test.skip("Squeak tests only work on Unix right now.")
-    try:
-        py.path.local.sysfind("squeak")
-    except py.error.ENOENT:
+    if py.path.local.sysfind("squeak") is None:
         py.test.skip("Squeak is not on your path.")
     if os.getenv("SQUEAK_IMAGE") is None:
         py.test.skip("Squeak tests expect the SQUEAK_IMAGE environment "