Webware for Python

Update of /cvsroot/webware/Webware/WebKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv306

Modified Files:
	ImportSpy.py 
Log Message:
Applied fix to recognize .pyo files.



Index: ImportSpy.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/ImportSpy.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ImportSpy.py	28 Mar 2003 00:14:02 -0000	1.6
--- ImportSpy.py	4 Feb 2004 23:56:59 -0000	1.7
***************
*** 9,12 ****
--- 9,18 ----
  to poll sys.modules, then we don't need this fanciness.
  
+ jdh: I'm not sure.  The original implementation from Tavis used sys.modules
+ like you say.  I implemented this to avoid having any polling at all,
+ but perhaps it's not worth it.  I'm not sure if there were other
+ factors in the design which pointed to this solution.
+ 
+ 
  This module helps save the filepath of every module which is imported.
  This is used by the `AutoReloadingAppServer` (see doc strings for more
***************
*** 135,139 ****
  			elif f and f not in fileList.keys():
  				# record the .py file corresponding to each '.pyc'
! 				if f[-4:] == '.pyc':
  					f = f[:-1]
  				try:
--- 141,145 ----
  			elif f and f not in fileList.keys():
  				# record the .py file corresponding to each '.pyc'
! 				if f[-4:].lower() in ['.pyc', '.pyo']:
  					f = f[:-1]
  				try:

Update of /cvsroot/webware/Webware/WebKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29123

Modified Files:
	AppServer 
Log Message:
Detect -u (unbuffered output) and -O (optimize) options in AppServer script,
and pass these to python.



Index: AppServer
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/AppServer,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AppServer	1 Nov 2002 18:40:25 -0000	1.12
--- AppServer	4 Feb 2004 23:43:30 -0000	1.13
***************
*** 1,9 ****
  #!/bin/sh
  
! # as long as the appserver returns a 3, it wants to be restarted
  
  retcode=3
  while test $retcode -eq 3; do
!     /usr/bin/env python Launch.py ThreadedAppServer $*
      retcode=$?
  done
--- 1,18 ----
  #!/bin/sh
  
! # You may give the following Python parameters in advance
! # followed by the parameters passed on to ThreadedAppServer
! # -O with optimization (.pyo instead of .pyc)
! # -u unbuffered output (useful for debugging)
! unset OPTIONS
! while getopts ":Ou" OPT; do    
! 	case $OPT in O | u) OPTIONS="$OPTIONS -$OPT";; esac
! done
! shift `expr $OPTIND - 1`
  
+ # as long as the appserver returns a 3, it wants to be restarted
  retcode=3
  while test $retcode -eq 3; do
!     /usr/bin/env python $OPTIONS Launch.py ThreadedAppServer $*
      retcode=$?
  done

Update of /cvsroot/webware/Webware/WebKit/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29123/Docs

Modified Files:
	RelNotes-X.Y.html 
Log Message:
Detect -u (unbuffered output) and -O (optimize) options in AppServer script,
and pass these to python.



Index: RelNotes-X.Y.html
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Docs/RelNotes-X.Y.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RelNotes-X.Y.html	16 Jan 2004 18:36:24 -0000	1.10
--- RelNotes-X.Y.html	4 Feb 2004 23:43:30 -0000	1.11
***************
*** 48,52 ****
  		static files.
  
! 	<li> *
  </ul>
  
--- 48,55 ----
  		static files.
  
! 	<li>AppServer script detects -u (unbuffered output) and -O (optimize) 
! 		parameters and passes them to python.  These parameters must precede 
! 		any other parameters.  Other parameters will be passed to 
! 		ThreadedAppServer normally.
  </ul>