[Happydoc-checkins] CVS: HappyDoc3/happydoclib pluginloader.py,1.2,1.3

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib
In directory sc8-pr-cvs1:/tmp/cvs-serv28787/happydoclib

Modified Files:
	pluginloader.py 
Log Message:
Quiet trace statements.


Index: pluginloader.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/pluginloader.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pluginloader.py	7 Dec 2002 17:02:12 -0000	1.2
--- pluginloader.py	29 Dec 2002 18:35:33 -0000	1.3
***************
*** 70,73 ****
--- 70,75 ----
  #
  
+ TRACE_LEVEL=3
+ 
  class PluginException(Exception):
  
***************
*** 108,112 ****
                     moduleName=moduleName,
                     modulePath=modulePath,
!                    parentModulePrefix=parentModulePrefix)
          #
          # Initialize the base class
--- 110,116 ----
                     moduleName=moduleName,
                     modulePath=modulePath,
!                    parentModulePrefix=parentModulePrefix,
!                    outputLevel=TRACE_LEVEL,
!                    )
          #
          # Initialize the base class
***************
*** 140,145 ****
          for _module_name in _module_list:
              TRACE.into('PluginLoader', '__init__:Loop',
!                                    _module_name=_module_name,
!                                    )
              module_name_parts = _module_name.split(os.sep)
              module_base_name = module_name_parts[-1]
--- 144,150 ----
          for _module_name in _module_list:
              TRACE.into('PluginLoader', '__init__:Loop',
!                        _module_name=_module_name,
!                        outputLevel=TRACE_LEVEL,
!                        )
              module_name_parts = _module_name.split(os.sep)
              module_base_name = module_name_parts[-1]
***************
*** 149,153 ****
                        (plugin_set_name, self.plugin_set_name)
              parent_package_name = module_name_parts[-3]
!             TRACE.writeVar(parent_package_name=parent_package_name)
  
              _module_name = os.path.basename(_module_name)
--- 154,160 ----
                        (plugin_set_name, self.plugin_set_name)
              parent_package_name = module_name_parts[-3]
!             TRACE.writeVar(parent_package_name=parent_package_name,
!                            outputLevel=TRACE_LEVEL,
!                            )
  
              _module_name = os.path.basename(_module_name)
***************
*** 158,165 ****
              else:
                  _import_name = '%s.%s' % (plugin_set_name, module_base_name)
!             TRACE.writeVar(_import_name=_import_name)
              
              try:
!                 TRACE.write('Importing %s' % _import_name)
                  _module = __import__( _import_name )
              except Exception, msg:
--- 165,176 ----
              else:
                  _import_name = '%s.%s' % (plugin_set_name, module_base_name)
!             TRACE.writeVar(_import_name=_import_name,
!                            outputLevel=TRACE_LEVEL,
!                            )
              
              try:
!                 TRACE.write('Importing %s' % _import_name,
!                             outputLevel=TRACE_LEVEL,
!                             )
                  _module = __import__( _import_name )
              except Exception, msg:
***************
*** 169,180 ****
                      traceback.print_exc(file=buffer)
                      TRACE.into('PluginLoader' 'Plugin module error',
!                                _import_name=_import_name)
!                     TRACE.write(buffer.getvalue())
!                     TRACE.outof()
                      buffer.write('---------------------------\n\n')
!                     TRACE.outof()
                      raise PluginException( buffer.getvalue(), _import_name )
                  elif int(os.environ.get('PLUGIN_SILENT_ERRORS', '0')):
!                     TRACE.outof()
                      continue
                  else:
--- 180,195 ----
                      traceback.print_exc(file=buffer)
                      TRACE.into('PluginLoader' 'Plugin module error',
!                                _import_name=_import_name,
!                                outputLevel=TRACE_LEVEL,
!                                )
!                     TRACE.write(buffer.getvalue(),
!                                 outputLevel=TRACE_LEVEL,
!                                 )
!                     TRACE.outof(outputLevel=TRACE_LEVEL)
                      buffer.write('---------------------------\n\n')
!                     TRACE.outof(outputLevel=TRACE_LEVEL)
                      raise PluginException( buffer.getvalue(), _import_name )
                  elif int(os.environ.get('PLUGIN_SILENT_ERRORS', '0')):
!                     TRACE.outof(outputLevel=TRACE_LEVEL)
                      continue
                  else:
***************
*** 182,186 ****
                      traceback.print_exc()
                      sys.stderr.write('---------------------------\n\n')
!                     TRACE.outof()
                      continue
  
--- 197,201 ----
                      traceback.print_exc()
                      sys.stderr.write('---------------------------\n\n')
!                     TRACE.outof(outputLevel=TRACE_LEVEL)
                      continue
  
***************
*** 203,209 ****
                  self.addEntryPoint(info)
  
!             TRACE.outof()
  
!         TRACE.outof()
          return
  
--- 218,224 ----
                  self.addEntryPoint(info)
  
!             TRACE.outof(outputLevel=TRACE_LEVEL)
  
!         TRACE.outof(outputLevel=TRACE_LEVEL)
          return