[jToolkit-cvs] jToolkit/web __init__.py,1.6,1.7

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30874

Modified Files:
	__init__.py 
Log Message:
removed general dependency on safeapache by moving the import inside the handler function



Index: __init__.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/web/__init__.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** __init__.py	14 Oct 2003 15:47:25 -0000	1.6
--- __init__.py	9 Feb 2004 13:15:24 -0000	1.7
***************
*** 20,28 ****
  
  import sys
- from jToolkit.web import safeapache
  from jToolkit.web import httpcodes
  
  # list of modules in this package
! __all__ = ["safeapache", "server", "session"]
  
  # the global list of application servers, used to remember the server based on the fullinstancename
--- 20,27 ----
  
  import sys
  from jToolkit.web import httpcodes
  
  # list of modules in this package
! __all__ = ["server", "session"]
  
  # the global list of application servers, used to remember the server based on the fullinstancename
***************
*** 30,34 ****
  servers = {}
  
! logtimes = 0
  
  def logtimetofile(message):
--- 29,33 ----
  servers = {}
  
! logtimes = 1
  
  def logtimetofile(message):
***************
*** 57,61 ****
      thread = blank()
      thread.get_ident = thread_get_ident
!   logfilename = '/tmp/threads.log'
    logtime = logtimetofile
  else:
--- 56,60 ----
      thread = blank()
      thread.get_ident = thread_get_ident
!   logfilename = 'c:\\temp\\trace.log'
    logtime = logtimetofile
  else:
***************
*** 93,96 ****
--- 92,97 ----
    """the standard handler which locates the instance, creates the server if neccessary, and hands off to it"""
    logtime('handler start: ' + req.uri)
+   # import safeapache here to prevent others from importing it
+   from jToolkit.web import safeapache
    apache_options = req.get_options()
    modulename = apache_options['jToolkit.module']