8 files changed, 9 insertions, 18 deletions
diff --git a/numpy/f2py/lib/__init__.py b/numpy/f2py/lib/__init__.py
index c3b40cb76..90a4a5367 100644
--- a/numpy/f2py/lib/__init__.py
+++ b/numpy/f2py/lib/__init__.py
@@ -12,3 +12,4 @@ Author: Pearu Peterson <pearu@cens.ioc.ee>
 Created: Oct 2006
 -----
 """
+__test__ = False
diff --git a/numpy/f2py/lib/parser/Fortran2003.py b/numpy/f2py/lib/parser/Fortran2003.py
index 1df58638d..8242ab0a0 100644
--- a/numpy/f2py/lib/parser/Fortran2003.py
+++ b/numpy/f2py/lib/parser/Fortran2003.py
@@ -5826,7 +5826,7 @@ if 1: # Optimize subclass tree:
 
     def _rpl_list(clsname):
         if clsname not in Base_classes:
-            print 'Not implemented:',clsname
+            #print 'Not implemented:',clsname
             return [] # remove this code when all classes are implemented
         cls = Base_classes[clsname]
         if 'match' in cls.__dict__:
@@ -5868,7 +5868,7 @@ for clsname, cls in Base_classes.items():
         else:
             print '%s not implemented needed by %s' % (n,clsname)
 
-if 1:
+if False:
     for cls in Base_classes.values():
         subclasses = Base.subclasses.get(cls.__name__,[])
         subclasses_names = [c.__name__ for c in subclasses]
diff --git a/numpy/f2py/lib/parser/test_Fortran2003.py b/numpy/f2py/lib/parser/test_Fortran2003.py
index 2e61a636d..3bf796b46 100644
--- a/numpy/f2py/lib/parser/test_Fortran2003.py
+++ b/numpy/f2py/lib/parser/test_Fortran2003.py
@@ -2056,7 +2056,7 @@ class TestContains(TestCase): # R1237
         assert_equal(str(a),'CONTAINS')
         assert_equal(repr(a),"Contains_Stmt('CONTAINS')")
 
-if 1:
+if False:
     nof_needed_tests = 0
     nof_needed_match = 0
     total_needs = 0
diff --git a/numpy/f2py/lib/tests/test_derived_scalar.py b/numpy/f2py/lib/tests/test_derived_scalar.py
index a7a93b07b..60c082171 100644
--- a/numpy/f2py/lib/tests/test_derived_scalar.py
+++ b/numpy/f2py/lib/tests/test_derived_scalar.py
@@ -15,9 +15,7 @@ Created: Oct 2006
 import os
 import sys
 from numpy.testing import *
-set_package_path()
-from lib.main import build_extension, compile
-restore_path()
+from numpy.f2py.lib.main import build_extension, compile
 
 fortran_code = '''
 subroutine foo(a)
diff --git a/numpy/f2py/lib/tests/test_module_module.py b/numpy/f2py/lib/tests/test_module_module.py
index 0eec2f586..5a3fefa32 100644
--- a/numpy/f2py/lib/tests/test_module_module.py
+++ b/numpy/f2py/lib/tests/test_module_module.py
@@ -16,9 +16,7 @@ import os
 import sys
 from numpy.testing import *
 
-set_package_path()
-from lib.main import build_extension, compile
-restore_path()
+from numpy.f2py.lib.main import build_extension, compile
 
 fortran_code = '''
 module test_module_module_ext2
diff --git a/numpy/f2py/lib/tests/test_module_scalar.py b/numpy/f2py/lib/tests/test_module_scalar.py
index e988a8e5f..acaae0517 100644
--- a/numpy/f2py/lib/tests/test_module_scalar.py
+++ b/numpy/f2py/lib/tests/test_module_scalar.py
@@ -15,9 +15,7 @@ Created: Oct 2006
 import os
 import sys
 from numpy.testing import *
-set_package_path()
-from lib.main import build_extension, compile
-restore_path()
+from numpy.f2py.lib.main import build_extension, compile
 
 fortran_code = '''
 module test_module_scalar_ext
diff --git a/numpy/f2py/lib/tests/test_scalar_function_in.py b/numpy/f2py/lib/tests/test_scalar_function_in.py
index ba8e23b48..bbc37d9f8 100644
--- a/numpy/f2py/lib/tests/test_scalar_function_in.py
+++ b/numpy/f2py/lib/tests/test_scalar_function_in.py
@@ -16,9 +16,7 @@ import os
 import sys
 from numpy.testing import *
 
-set_package_path()
-from lib.main import build_extension, compile
-restore_path()
+from numpy.f2py.lib.main import build_extension, compile
 
 fortran_code = '''\
 ! -*- f77 -*-
diff --git a/numpy/f2py/lib/tests/test_scalar_in_out.py b/numpy/f2py/lib/tests/test_scalar_in_out.py
index c0f10be89..1ffd95f01 100644
--- a/numpy/f2py/lib/tests/test_scalar_in_out.py
+++ b/numpy/f2py/lib/tests/test_scalar_in_out.py
@@ -16,9 +16,7 @@ import os
 import sys
 from numpy.testing import *
 
-set_package_path()
-from lib.main import build_extension, compile
-restore_path()
+from numpy.f2py.lib.main import build_extension, compile
 
 fortran_code = '''
       subroutine fooint1(a)