Removes unused import of all folders as packages

toolset/benchmark/framework_test.py

@@ -587,7 +587,7 @@ class FrameworkTest:
 
   def __getattr__(self, name):
     """For backwards compatibility, we used to pass benchmarker 
-    as the argument to the setup.py files"""
+    as the argument to the setup.sh files"""
     try:
       x = getattr(self.benchmarker, name)
     except AttributeError:
@@ -699,29 +699,12 @@ class FrameworkTest:
     if benchmarker.install_strategy is 'pertest':
       self.install_root="%s/pertest/%s" % (self.install_root, name)
 
-    # Used in setup.py scripts for consistency with 
+    # Used in setup.sh scripts for consistency with 
     # the bash environment variables
     self.troot = self.directory
     self.iroot = self.install_root
 
     self.__dict__.update(args)
-
-    # ensure directory has __init__.py file so that we can use it as a Python package
-    if not os.path.exists(os.path.join(directory, "__init__.py")):
-      logging.warning("Please add an empty __init__.py file to directory %s", directory)
-      open(os.path.join(directory, "__init__.py"), 'w').close()
-
-    # Import the module (TODO - consider using sys.meta_path)
-    # Note: You can see the log output if you really want to, but it's a *ton*
-    dir_rel_to_fwroot = os.path.relpath(os.path.dirname(directory), self.fwroot)
-    if dir_rel_to_fwroot != ".":
-      sys.path.append("%s/%s" % (self.fwroot, dir_rel_to_fwroot))
-      logging.log(0, "Adding %s to import %s.%s", dir_rel_to_fwroot, os.path.basename(directory), self.setup_file)
-      #self.setup_module = setup_module = importlib.import_module(os.path.basename(directory) + '.' + self.setup_file)
-      sys.path.remove("%s/%s" % (self.fwroot, dir_rel_to_fwroot))
-    else:
-      logging.log(0, "Importing %s.%s", directory, self.setup_file)
-      #self.setup_module = setup_module = importlib.import_module(os.path.basename(directory) + '.' + self.setup_file)
   ############################################################
   # End __init__
   ############################################################