Webware for Python

Author: chrisz
Date: Tue Mar 27 11:44:43 2007
New Revision: 6361

Modified:
   Webware/trunk/WebKit/HTTPRequest.py

Log:
Fixed bug in originalURLPath() and originalURI() methods.

Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py	(original)
+++ Webware/trunk/WebKit/HTTPRequest.py	Tue Mar 27 11:44:43 2007
@@ -618,7 +618,7 @@
 		if self._stack:
 			return self._stack[0][1]
 		else:
-			self.urlPath()
+			return self.urlPath()
 
 	def previousURLPath(self):
 		"""Get the previous URL path, if any."""
@@ -634,7 +634,7 @@
 		if self._stack:
 			return self._stack[0][2]
 		else:
-			self.uri()
+			return self.uri()
 
 	def previousURI(self):
 		"""Get the previous URI, if any."""

Author: chrisz
Date: Tue Mar 27 11:42:47 2007
New Revision: 6360

Modified:
   Webware/trunk/WebKit/ThreadedAppServer.py

Log:
Fixed bug in setting buffer sizes in ThreadedAppServer.py.

Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py	(original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py	Tue Mar 27 11:42:47 2007
@@ -812,7 +812,7 @@
 		requestDict['input'] = self.makeInput()
 		requestDict['requestID'] = self._requestID
 
-		streamOut = TASStreamOut(self._sock, bufferSize=self._responseBufferSize)
+		streamOut = TASStreamOut(self._sock, bufferSize=self._server._responseBufferSize)
 		transaction = self._server._app.dispatchRawRequest(requestDict, streamOut)
 		try:
 			streamOut.close()
@@ -837,7 +837,7 @@
 
 	def makeInput(self):
 		"""Create a file-like object from the socket."""
-		return self._sock.makefile("rb", self._requestBufferSize)
+		return self._sock.makefile("rb", self._server._requestBufferSize)
 
 
 # Determines whether the main look should run in another thread.

Author: chrisz
Date: Tue Mar 27 11:30:45 2007
New Revision: 6359

Modified:
   Webware/trunk/WebKit/HTTPRequest.py

Log:
Added methods for getting the original, previous and all previous servlets and their URIs to HTTPRequest. Restored the old parent() and parents() methods as synonyms.

Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py	(original)
+++ Webware/trunk/WebKit/HTTPRequest.py	Tue Mar 27 11:30:45 2007
@@ -326,13 +326,6 @@
 		else:
 			return self._pathInfo
 
-	def originalURLPath(self):
-		"""Return URL path of the original servlet before any forwarding."""
-		if self._stack:
-			return self._stack[0][1]
-		else:
-			self.urlPath()
-
 	def urlPathDir(self):
 		"""Same as urlPath, but only gives the directory."""
 		return os.path.dirname(self.urlPath())
@@ -578,8 +571,8 @@
 
 	def push(self, obj, url=None):
 		"""Push object and URL path on a stack, setting a new URL."""
-		urlPath = self.urlPath()
-		self._stack.append((obj, urlPath,
+		urlPath, uri = self.urlPath(), self.uri()
+		self._stack.append((obj, urlPath, uri,
 			self._serverSidePath, self._serverSideContextPath,
 			self._contextName, self._serverRootPath,
 			self._extraURLPath))
@@ -589,17 +582,69 @@
 	def pop(self):
 		"""Pop URL path and object from the stack, returning the object."""
 		if self._stack:
-			(obj, urlPath,
+			(obj, urlPath, uri,
 				self._serverSidePath, self._serverSideContextPath,
 				self._contextName, self._serverRootPath,
 				self._extraURLPath) = self._stack.pop()
 			self.setURLPath(urlPath)
 			return obj
 
+	def servlet(self):
+		"""Get current servlet for this request."""
+		return self._transaction.servlet()
+
+	def originalServlet(self):
+		"""Get original servlet before any forwarding."""
+		if self._stack:
+			return self._stack[0][0]
+		else:
+			self.servlet()
+
+	def previousServlet(self):
+		"""Get the servlet that passed this request to us, if any."""
+		if self._stack:
+			return self._stack[-1][0]
+
+	parent = previousServlet # kept old name as synonym
+
+	def previousServlets(self):
+		"""Get the list of all previous servlets."""
+		return [s[0] for s in self._stack]
+
+	parents = previousServlets # kept old name as synonym
+
+	def originalURLPath(self):
+		"""Get URL path of the original servlet before any forwarding."""
+		if self._stack:
+			return self._stack[0][1]
+		else:
+			self.urlPath()
+
+	def previousURLPath(self):
+		"""Get the previous URL path, if any."""
+		if self._stack:
+			return self._stack[-1][1]
+
 	def previousURLPaths(self):
-		"""Return the list of all previous URL paths."""
+		"""Get the list of all previous URL paths."""
 		return [s[1] for s in self._stack]
 
+	def originalURI(self):
+		"""Get URI of the original servlet before any forwarding."""
+		if self._stack:
+			return self._stack[0][2]
+		else:
+			self.uri()
+
+	def previousURI(self):
+		"""Get the previous URI, if any."""
+		if self._stack:
+			return self._stack[-1][2]
+
+	def previousURIs(self):
+		"""Get the list of all previous URIs."""
+		return [s[2] for s in self._stack]
+
 	def rawInput(self, rewind=False):
 		"""Get the raw input from the request.

Author: chrisz
Date: Mon Mar 26 14:58:49 2007
New Revision: 6358

Modified:
   Webware/trunk/WebKit/Application.py

Log:
Handle exceptions in error pages properly. Non-circular chains of custom errors are allowed, otherwise we fall back to standard error handling.

Modified: Webware/trunk/WebKit/Application.py
==============================================================================
--- Webware/trunk/WebKit/Application.py	(original)
+++ Webware/trunk/WebKit/Application.py	Mon Mar 26 14:58:49 2007
@@ -586,50 +586,70 @@
 				self.handleMissingPathSession(trans)
 				return
 		servlet = None
+		findServlet = self.rootURLParser().findServletForTransaction
 		try:
-			servlet = self.rootURLParser().findServletForTransaction(trans)
+			servlet = findServlet(trans)
 			self.runTransactionViaServlet(servlet, trans)
 		except EndResponse:
 			pass
 		except ConnectionAbortedError, err:
 			trans.setError(err)
 		except Exception, err:
-			trans.setError(err)
-			isHTTPException = isinstance(err, HTTPException)
-			if isHTTPException:
-				err.setTransaction(trans)
-			# get custom error page corresponding to the exception
-			# (but do not use a custom page if response is already committed)
-			if self._errorPage and not trans.response().isCommitted():
+			urls = []
+			while 1:
+				trans.setError(err)
+				isHTTPException = isinstance(err, HTTPException)
+				if isHTTPException:
+					err.setTransaction(trans)
+				# Get custom error page corresponding to the exception,
+				# but do not use custom page if response is already committed:
+				if not self._errorPage or trans.response().isCommitted():
+					break
 				url = self.getErrorPage(err.__class__)
 				if isHTTPException and not url:
 					# get custom error page for status code
 					code = err.code()
 					if self._errorPage.has_key(code):
 						url = self._errorPage[code]
-			else:
-				url = None
-			if url:
+				if not url or url in urls:
+					# If there is no custom error page configured,
+					# or we get into a circular chain of error pages,
+					# then we fall back to standard error handling.
+					break
+				urls.append(url)
 				# forward to custom error page
-				trans.setError(err)
 				if servlet:
 					self.returnServlet(servlet, trans)
 					servlet.resetKeyBindings()
-					trans.setServlet(None)
+					servlet = None
+					trans.setServlet(servlet)
 				request = trans.request()
 				originalURL = request.urlPath()
 				request.setURLPath(url)
 				try:
-					servlet = self.rootURLParser(
-						).findServletForTransaction(trans)
-				finally:
-					request.setURLPath(originalURL)
-				trans.response().reset()
-				try:
-					self.runTransactionViaServlet(servlet, trans)
+					try:
+						servlet = findServlet(trans)
+					finally:
+						# give the error page the original URL as information
+						request.setURLPath(originalURL)
+					trans.response().reset()
+					try:
+						self.runTransactionViaServlet(servlet, trans)
+					except EndResponse:
+						pass
 				except EndResponse:
 					pass
-			elif isHTTPException:
+				except ConnectionAbortedError, err:
+					trans.setError(err)
+				except Exception, err:
+					# If the custom error page itself throws an exception,
+					# display the new exception instead of the original one,
+					# so we notice that something is broken here.
+					request.setURLPath(url)
+					url = None
+				if url:
+					return # error has already been handled
+			if isHTTPException:
 				# display standard http error page
 				trans.response().displayError(err)
 			else:

Author: chrisz
Date: Sat Mar 24 07:31:41 2007
New Revision: 6354

Modified:
   Webware/trunk/WebKit/HTTPRequest.py

Log:
Bugfix in HTTPRequest.originalURLPath().

Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py	(original)
+++ Webware/trunk/WebKit/HTTPRequest.py	Sat Mar 24 07:31:41 2007
@@ -328,8 +328,8 @@
 
 	def originalURLPath(self):
 		"""Return URL path of the original servlet before any forwarding."""
-		if self._path:
-			return self._path[0][1]
+		if self._stack:
+			return self._stack[0][1]
 		else:
 			self.urlPath()

Author: chrisz
Date: Sat Mar 24 06:05:28 2007
New Revision: 6353

Modified:
   Webware/trunk/WebKit/HTTPExceptions.py

Log:
Fixed security issue in HTTPExceptions.py (as suggested by Michael Hanselmann 2007-03-23).

Modified: Webware/trunk/WebKit/HTTPExceptions.py
==============================================================================
--- Webware/trunk/WebKit/HTTPExceptions.py	(original)
+++ Webware/trunk/WebKit/HTTPExceptions.py	Sat Mar 24 06:05:28 2007
@@ -10,6 +10,7 @@
 into responses. In various places these can also be caught and
 changed, for instance an `HTTPAuthenticationRequired` could be
 turned into a normal login page.
+
 """
 
 from WebUtils.Funcs import htmlEncode
@@ -77,7 +78,8 @@
 		"""The HTML body of the page."""
 		body = self.htDescription()
 		if self.args:
-			body += ''.join(['<p>%s</p>\n' % str(l) for l in self.args])
+			body += ''.join(['<p>%s</p>\n'
+				% htmlEncode(str(p)) for p in self.args])
 		return body
 
 	def description(self):
@@ -268,7 +270,7 @@
 		page = trans.application()._404Page
 		if page:
 			uri = trans.request().uri()
-			return page % uri
+			return page % htmlEncode(uri)
 		else:
 			return HTTPException.html(self)

Author: chrisz
Date: Sat Mar 24 05:43:19 2007
New Revision: 6352

Modified:
   Webware/trunk/WebKit/Configs/AppServer.config
   Webware/trunk/WebKit/Configs/Application.config
   Webware/trunk/WebKit/Docs/Configuration.txt

Log:
Documented the new settings, added some comments to AppServer.config.

Modified: Webware/trunk/WebKit/Configs/AppServer.config
==============================================================================
--- Webware/trunk/WebKit/Configs/AppServer.config	(original)
+++ Webware/trunk/WebKit/Configs/AppServer.config	Sat Mar 24 05:43:19 2007
@@ -1,14 +1,24 @@
+# AppServer.config file for Webware for Python
+
 PrintConfigAtStartUp = True
-Verbose = True
-Host = 'localhost'
-EnableAdapter = True
+Verbose = True # verbose output
+
+PlugInDirs = [WebwarePath] # load all Wewbare plug-ins
+PlugIns = [] # use this if you want to load specific plug-ins only
+
+# This is the IP address at which the application server will listen:
+Host = 'localhost' # use '' for listening on all network interfaces
+
+EnableAdapter = True # enable WebKit adapter
 AdapterPort = 8086
-EnableHTTP = True
+
+EnableHTTP = True # enable built-in Webwserver
 HTTPPort = 8080
-PlugIns = []
-PlugInDirs = [WebwarePath]
+
+# The initial, minimum and maxium number of worker threads:
 StartServerThreads = 10
-MaxServerThreads = 20
 MinServerThreads = 5
-CheckInterval = 100
-AutoReload = False
\ No newline at end of file
+MaxServerThreads = 20
+
+# You can activate auto reloading on source changes here:
+AutoReload = False

Modified: Webware/trunk/WebKit/Configs/Application.config
==============================================================================
--- Webware/trunk/WebKit/Configs/Application.config	(original)
+++ Webware/trunk/WebKit/Configs/Application.config	Sat Mar 24 05:43:19 2007
@@ -1,3 +1,5 @@
+# Application.config file for Webware for Python
+
 # The password for the Admin context:
 AdminPassword = '' # you cannot log in with an empty password
 

Modified: Webware/trunk/WebKit/Docs/Configuration.txt
==============================================================================
--- Webware/trunk/WebKit/Docs/Configuration.txt	(original)
+++ Webware/trunk/WebKit/Docs/Configuration.txt	Sat Mar 24 05:43:19 2007
@@ -412,6 +412,18 @@
     to ``sys.setcheckinterval()``.  Benchmarks have shown 100 to give a
     worthwhile performance boost with higher values resulting in
     little gain.  Default: ``100``.
+``RequestQueueSize``:
+    The size of the queue for request handlers that is worked off by the
+    server threads.  A size of zero is interpreted as two times the maximum
+    number of worker threads, which has proven to be a reasonable number.
+    Default: ``0`` (``2*MaxServerThreads``).
+``RequestBufferSize``:
+    Buffer size used for reading incoming socket requests.  Default: ``8192``.
+``ResponseBufferSize``:
+    Buffer size for the output response stream.  This is only used when a
+    servlet has set ``autoFlush`` to True using the ``flush()`` method of
+    the Response.  Otherwise, the whole response is buffered and sent in one
+    shot when the servlet is done.  Default: ``8192``.
 ``AutoReload``:
     Enables the AutoReloadingAppServer module.  This module is designed
     to notice changes to source files, including servlets, PSP's templates,

Author: chrisz
Date: Sat Mar 24 04:43:57 2007
New Revision: 6351

Modified:
   Webware/trunk/WebKit/ASStreamOut.py
   Webware/trunk/WebKit/ThreadedAppServer.py

Log:
Added setting ResponseBufferSize for changing the buffer size of the output stream.

Modified: Webware/trunk/WebKit/ASStreamOut.py
==============================================================================
--- Webware/trunk/WebKit/ASStreamOut.py	(original)
+++ Webware/trunk/WebKit/ASStreamOut.py	Sat Mar 24 04:43:57 2007
@@ -37,9 +37,9 @@
 
 	"""
 
-	def __init__(self):
-		self._autoCommit = False
-		self._bufferSize = 8192
+	def __init__(self, autoCommit=False, bufferSize=8192):
+		self._autoCommit = autoCommit
+		self._bufferSize = bufferSize
 		self._committed = False
 		self._needCommit = False
 		self._chunks = []
@@ -158,7 +158,6 @@
 		"""Are we committed?"""
 		return self._committed
 
-
 	def needCommit(self):
 		"""Request for commitment.
 

Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py	(original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py	Sat Mar 24 04:43:57 2007
@@ -28,7 +28,6 @@
 import AppServer as AppServerModule
 from AutoReloadingAppServer import AutoReloadingAppServer as AppServer
 from ASStreamOut import ASStreamOut, ConnectionAbortedError
-
 from MiscUtils.Funcs import timestamp
 from WebUtils import Funcs
 
@@ -48,6 +47,7 @@
 	# @@ the following settings are not yet officially documented
 	'RequestQueueSize': 0, # means twice the maximum number of threads
 	'RequestBufferSize': 8*1024, # 8 kBytes
+	'ResponseBufferSize': 8*1024, # 8 kBytes
 	# @@ the following setting is not yet implemented
 	# 'SocketType': 'inet', # inet, inet6, unix
 }
@@ -107,6 +107,7 @@
 			# otherwise do not make it smaller than the max number of threads
 			self._requestQueueSize = self._maxServerThreads
 		self._requestBufferSize = self.setting('RequestBufferSize')
+		self._responseBufferSize = self.setting('ResponseBufferSize')
 
 		self._threadPool = []
 		self._threadCount = 0
@@ -733,14 +734,14 @@
 
 	"""
 
-	def __init__(self, sock):
+	def __init__(self, sock, autoCommit=False, bufferSize=8192):
 		"""Create stream.
 
 		We get an extra `sock` argument, which is the socket which we'll
 		stream output to (if we're streaming).
 
 		"""
-		ASStreamOut.__init__(self)
+		ASStreamOut.__init__(self, autoCommit, bufferSize)
 		self._socket = sock
 
 	def flush(self):
@@ -811,7 +812,7 @@
 		requestDict['input'] = self.makeInput()
 		requestDict['requestID'] = self._requestID
 
-		streamOut = TASStreamOut(self._sock)
+		streamOut = TASStreamOut(self._sock, bufferSize=self._responseBufferSize)
 		transaction = self._server._app.dispatchRawRequest(requestDict, streamOut)
 		try:
 			streamOut.close()

Author: chrisz
Date: Fri Mar 23 12:18:26 2007
New Revision: 6349

Modified:
   Webware/trunk/WebKit/Application.py
   Webware/trunk/WebKit/HTTPRequest.py
   Webware/trunk/WebKit/Testing/DebugPage.py
   Webware/trunk/WebKit/Testing/Dir/Forward3.py
   Webware/trunk/WebKit/Testing/Forward1.py
   Webware/trunk/WebKit/Testing/Forward2.py
   Webware/trunk/WebKit/Testing/IncludeURLTest.py

Log:
Errors after forwarding to another servlet caused the original servlet to get stuck in "limbo" without being returned to the servlet cache and without releasing its resources. Forwading has now been implemented more cleanly. We do not only store the old servlet, but also the original Request URL on the _parents stack of the Request which has been renamed to _stack. The originalURLPath() is now computed from the first element of _stack. (Bug report and analysis submitted by Andrew Butash).

Modified: Webware/trunk/WebKit/Application.py
==============================================================================
--- Webware/trunk/WebKit/Application.py	(original)
+++ Webware/trunk/WebKit/Application.py	Fri Mar 23 12:18:26 2007
@@ -495,6 +495,18 @@
 					except ConnectionAbortedError:
 						trans.setErrorOccurred(True)
 					response.clearTransaction()
+					# release possible servlets on the stack
+					while 1:
+						servlet = request.pop()
+						if servlet is None:
+							break
+						self.returnServlet(servlet, trans)
+						servlet.resetKeyBindings()
+					# get current servlet (this may have changed)
+					servlet = trans.servlet()
+					if servlet:
+						# return the current servlet to its pool
+						self.returnServlet(servlet, trans)
 				if self.setting('LogActivity'):
 					self.writeActivityLog(trans)
 			request.clearTransaction()
@@ -531,8 +543,6 @@
 		Called by `dispatchRawRequest`.
 
 		"""
-		# @@ gtalvola: I'm guessing this is not the ideal place
-		# @@ to put this code. But, it works.
 		if self.setting('UseAutomaticPathSessions'):
 			request = trans.request()
 			request_has_cookie_session = request.hasCookieSession()
@@ -543,20 +553,14 @@
 			elif not request_has_cookie_session and not request_has_path_session:
 				self.handleMissingPathSession(trans)
 				return
-		servlet = None
 		try:
-			try:
-				servlet = self._rootURLParser.findServletForTransaction(trans)
-				self.runTransactionViaServlet(servlet, trans)
-			except HTTPExceptions.HTTPException, err:
-				err.setTransaction(trans)
-				trans.response().displayError(err)
-			except EndResponse:
-				pass
-		finally:
-			if servlet:
-				# Return the servlet to its pool
-				self.returnServlet(servlet, trans)
+			servlet = self.rootURLParser().findServletForTransaction(trans)
+			self.runTransactionViaServlet(servlet, trans)
+		except HTTPExceptions.HTTPException, err:
+			err.setTransaction(trans)
+			trans.response().displayError(err)
+		except EndResponse:
+			pass
 
 	def runTransactionViaServlet(self, servlet, trans):
 		"""Execute the transaction using the servlet.
@@ -621,37 +625,26 @@
 		and ``**kw`` are passed as arguments to that method).
 
 		"""
-		urlPath = self.resolveInternalRelativePath(trans, url)
-		req = trans.request()
-		currentPath = req.urlPath()
-		currentServlet = trans._servlet
-		currentServerSidePath = req._serverSidePath
-		currentServerSideContextPath = req._serverSideContextPath
-		currentContextName = req._contextName
-		currentServerRootPath = req._serverRootPath
-		currentExtraURLPath = req._extraURLPath
-		req.setURLPath(urlPath)
-		req.addParent(currentServlet)
-
-		servlet = self._rootURLParser.findServletForTransaction(trans)
-		trans._servlet = servlet
+		# store current request and set the new URL
+		request = trans.request()
+		request.push(trans.servlet(),
+			self.resolveInternalRelativePath(trans, url))
+		# get new servlet
+		servlet = self.rootURLParser().findServletForTransaction(trans)
+		trans.setServlet(servlet)
+		# call method of included servlet
 		if hasattr(servlet, 'runMethodForTransaction'):
 			result = servlet.runMethodForTransaction(trans, method, *args, **kw)
 		else:
 			servlet.awake(trans)
 			result = getattr(servlet, method)(*args, **kw)
 			servlet.sleep(trans)
-
-		# Put things back
-		req.setURLPath(currentPath)
-		req._serverSidePath = currentServerSidePath
-		req._serverSideContextPath = currentServerSideContextPath
-		req._contextName = currentContextName
-		req._serverRootPath = currentServerRootPath
-		req._extraURLPath = currentExtraURLPath
-		req.popParent()
-		trans._servlet = currentServlet
-
+		# return new servlet to its pool
+		self.returnServlet(servlet, trans)
+		# release bindings of new servlet
+		servlet.resetKeyBindings()
+		# restore current request
+		trans.setServlet(request.pop())
 		return result
 
 	def includeURL(self, trans, url):
@@ -661,36 +654,26 @@
 		except control is ultimately returned to the servlet.
 
 		"""
-		urlPath = self.resolveInternalRelativePath(trans, url)
-		req = trans.request()
-		currentPath = req.urlPath()
-		currentServlet = trans._servlet
-		currentServerSidePath = req._serverSidePath
-		currentServerSideContextPath = req._serverSideContextPath
-		currentContextName = req._contextName
-		req.setURLPath(urlPath)
-		req.addParent(currentServlet)
-
-		# Run the included servlet.
-		# (2006-07-05 cz: Do not use try/finally here, because exception
-		# handling should happen in the context of the included servlet.)
-		servlet = self._rootURLParser.findServletForTransaction(trans)
-		trans._servlet = servlet
-		# We will interpret an EndResponse in an included page to mean that
-		# the current page may continue processing.
+		# store current request and set the new URL
+		request = trans.request()
+		request.push(trans.servlet(),
+			self.resolveInternalRelativePath(trans, url))
+		# get new servlet
+		servlet = self.rootURLParser().findServletForTransaction(trans)
+		trans.setServlet(servlet)
+		# run the included servlet
 		try:
 			servlet.runTransaction(trans)
 		except EndResponse:
+			# we interpret an EndResponse in an included page to mean
+			# that the current page may continue processing
 			pass
+		# return new servlet to its pool
 		self.returnServlet(servlet, trans)
-
-		# Restore everything properly
-		req.popParent()
-		req.setURLPath(currentPath)
-		req._serverSidePath = currentServerSidePath
-		req._serverSideContextPath = currentServerSideContextPath
-		req._contextName = currentContextName
-		trans._servlet = currentServlet
+		# release bindings of new servlet
+		servlet.resetKeyBindings()
+		# restore current request
+		trans.setServlet(request.pop())
 
 	def resolveInternalRelativePath(self, trans, url):
 		"""Return the absolute internal path.
@@ -707,7 +690,7 @@
 				if not origDir.endswith('/'):
 					origDir += '/'
 			url = origDir + url
-		# Deal with . and .. in the path:
+		# deal with . and .. in the path
 		parts = []
 		for part in url.split('/'):
 			if parts and part == '..':
@@ -738,8 +721,8 @@
 		`ExceptionHandler.ExceptionHandler`.
 
 		"""
-		req = transaction.request()
-		editlink = req.adapterName() + "/Admin/EditFile"
+		request = transaction.request()
+		editlink = request.adapterName() + "/Admin/EditFile"
 		self._exceptionHandlerClass(self, transaction,
 			excInfo, {"editlink": editlink})
 

Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py	(original)
+++ Webware/trunk/WebKit/HTTPRequest.py	Fri Mar 23 12:18:26 2007
@@ -29,7 +29,7 @@
 
 	def __init__(self, dict={}):
 		Request.__init__(self)
-		self._parents = []
+		self._stack = []
 		if dict:
 			# Dictionaries come in from web server adapters like the CGIAdapter
 			assert dict['format'] == 'CGI'
@@ -37,20 +37,21 @@
 			self._environ = dict['environ']
 			self._input = dict['input']
 			self._requestID = dict['requestID']
-			self._fields = FieldStorage.FieldStorage(self._input,
-				environ=self._environ, keep_blank_values=True, strict_parsing=False)
+			self._fields = FieldStorage.FieldStorage(
+				self._input, environ=self._environ,
+				keep_blank_values=True, strict_parsing=False)
 			self._fields.parse_qs()
 			self._cookies = Cookie()
 			if self._environ.has_key('HTTP_COOKIE'):
 				# Protect the loading of cookies with an exception handler,
-				# because some cookies from MSIE are known to break the cookie module.
+				# because MSIE cookies sometimes can break the cookie module.
 				try:
 					self._cookies.load(self._environ['HTTP_COOKIE'])
 				except:
 					traceback.print_exc(file=sys.stderr)
 		else:
-			# If there's no dictionary, we pretend we're a CGI script and see what happens...
-			import time
+			# If there's no dictionary, we pretend we're a CGI script
+			# and see what happens...
 			self._time = time.time()
 			self._environ = os.environ.copy()
 			self._input = None
@@ -127,7 +128,6 @@
 			self._fsPath = self.fsPath()
 		self._adapterName = self.servletPath()
 		self._pathInfo = self.pathInfo()
-		self._originalURLPath = self.urlPath()
 
 		if debug:
 			print "Done setting up request, found keys %r" % self._fields.keys()
@@ -221,10 +221,11 @@
 			return self._cookies.get(name, default)
 
 	def hasCookie(self, name):
+		"""Return whether a cookie with the given name exists."""
 		return self._cookies.has_key(name)
 
 	def cookies(self):
-		"""Return a dictionary-style object of all Cookie objects the client sent with this request."""
+		"""Return a dict of all cookies the client sent with this request."""
 		return self._cookies
 
 
@@ -251,11 +252,11 @@
 		return self._transaction.session()
 
 	def isSessionExpired(self):
-		"""Return whether or not this request originally contained an expired session ID.
+		"""Return whether the request originally had an expired session ID.
 
-		Only works if the Application.config setting "IgnoreInvalidSession" is set to true;
-		otherwise you get a canned error page on an invalid session,
-		so your servlet never gets processed.
+		Only works if the Application.config setting "IgnoreInvalidSession"
+		is set to true; otherwise you get a canned error page on an invalid
+		session, so your servlet never gets processed.
 
 		"""
 		return self._sessionExpired
@@ -275,7 +276,7 @@
 		return self._environ['REMOTE_USER']
 
 	def remoteAddress(self):
-		"""Return a string containing the IP address of the client that sent the request."""
+		"""Return a string containing the IP address of the client."""
 		return self._environ['REMOTE_ADDR']
 
 	def remoteName(self):
@@ -288,7 +289,7 @@
 		return env.get('REMOTE_NAME', env['REMOTE_ADDR'])
 
 	def accept(self, which=None):
-		"""Returns preferences as requested by the user agent.
+		"""Return preferences as requested by the user agent.
 
 		The accepted preferences are returned as a list of codes
 		in the same order as they appeared in the header.
@@ -312,9 +313,10 @@
 	## Path ##
 
 	def urlPath(self):
-		"""Return the URL path of the servlet sans host, adapter and query string.
+		"""Return URL path without host, adapter and query string.
 
-		For example, http://host/WebKit.cgi/Context/Servlet?x=1 yields '/Context/Servlet'.
+		For example, http://host/WebKit.cgi/Context/Servlet?x=1
+		yields '/Context/Servlet'.
 
 		If self._absolutepath is set, this refers to the filesystem path.
 
@@ -325,8 +327,11 @@
 			return self._pathInfo
 
 	def originalURLPath(self):
-		"""Return the URL path of the _original_ servlet before any forwarding."""
-		return self._originalURLPath
+		"""Return URL path of the original servlet before any forwarding."""
+		if self._path:
+			return self._path[0][1]
+		else:
+			self.urlPath()
 
 	def urlPathDir(self):
 		"""Same as urlPath, but only gives the directory."""
@@ -364,8 +369,8 @@
 	def serverSideContextPath(self, path=None):
 		"""Return the absolute server-side path of the context of this request.
 
-		If the optional path is passed in, then it is joined with the server side
-		context directory to form a path relative to the object.
+		If the optional path is passed in, then it is joined with the server
+		side context directory to form a path relative to the object.
 
 		This directory could be different from the result of serverSidePath()
 		if the request is in a subdirectory of the main context directory.
@@ -382,13 +387,14 @@
 	def contextName(self):
 		"""Return the name of the context of this request.
 
-		This isn't necessarily the same as the name of the directory containing the context.
+		This isn't necessarily the same as the name of the directory
+		containing the context.
 
 		"""
 		return self._contextName
 
 	def servletURI(self):
-		"""Return the URI of the servlet, without any query strings or extra path info."""
+		"""Return servlet URI without any query strings or extra path info."""
 		p = self._pathInfo
 		if not self._extraURLPath:
 			if p.endswith('/'):
@@ -478,7 +484,10 @@
 		return fullurl
 
 	def siteRoot(self):
-		"""Return the URL path components necessary to get back home from the current location.
+		"""Return the relative URL path of the home location.
+
+		This includes all URL path components necessary to get back home
+		from the current location.
 
 		Examples:
 			''
@@ -487,12 +496,12 @@
 
 		You can use this as a prefix to a URL that you know is based off
 		the home location. Any time you are in a servlet that may have been
-		forwarded to from another servlet at a different level,
-		you should prefix your URL's with this. That is, if servlet "Foo/Bar"
-		forwards to "Qux", then the qux servlet should use siteRoot() to construct all
+		forwarded to from another servlet at a different level, you should
+		prefix your URL's with this. That is, if servlet "Foo/Bar" forwards
+		to "Qux", then the qux servlet should use siteRoot() to construct all
 		links to avoid broken links. This works properly because this method
-		computes the path based on the _original_ servlet, not the location of the
-		servlet that you have forwarded to.
+		computes the path based on the _original_ servlet, not the location
+		of the servlet that you have forwarded to.
 
 		"""
 		url = self.originalURLPath()
@@ -505,7 +514,10 @@
 		return '../' * numStepsBack
 
 	def siteRootFromCurrentServlet(self):
-		"""Return the URL path componentes necessary to get back home from the current servlet.
+		"""Return relative URL path to home seen from the current servlet.
+
+		This includes all URL path components necessary to get back home
+		from the current servlet (not from the original request).
 
 		Similar to siteRoot() but instead, it returns the site root
 		relative to the _current_ servlet, not the _original_ servlet.
@@ -524,9 +536,9 @@
 		"""Return the "servlet path" of this servlet relative to the siteRoot.
 
 		In other words, everything after the name of the context (if present).
-		If you append this to the result of self.siteRoot() you get back to the
-		current servlet. This is useful for saving the path to the current servlet
-		in a database, for example.
+		If you append this to the result of self.siteRoot() you get back to
+		the current servlet. This is useful for saving the path to the current
+		servlet in a database, for example.
 
 		"""
 		urlPath = self.urlPath()
@@ -557,38 +569,47 @@
 		return self._adapterName
 
 	def rawRequest(self):
-		"""Return the raw request that was used to initialize this request object."""
+		"""Return the raw request used to initialize this request object."""
 		return self._rawRequest
 
 	def environ(self):
+		"""Get the environment for the request."""
 		return self._environ
 
-	def addParent(self, servlet):
-		self._parents.append(servlet)
-
-	def popParent(self):
-		if self._parents:
-			self._parents.pop()
-
-	def parent(self):
-		"""Get the servlet that passed this request to us, if any."""
-		if self._parents:
-			return self._parents[len(self._parents)-1]
-
-	def parents(self):
-		"""Return the parents list."""
-		return self._parents
+	def push(self, obj, url=None):
+		"""Push object and URL path on a stack, setting a new URL."""
+		urlPath = self.urlPath()
+		self._stack.append((obj, urlPath,
+			self._serverSidePath, self._serverSideContextPath,
+			self._contextName, self._serverRootPath,
+			self._extraURLPath))
+		if url is not None:
+			self.setURLPath(url)
+
+	def pop(self):
+		"""Pop URL path and object from the stack, returning the object."""
+		if self._stack:
+			(obj, urlPath,
+				self._serverSidePath, self._serverSideContextPath,
+				self._contextName, self._serverRootPath,
+				self._extraURLPath) = self._stack.pop()
+			self.setURLPath(urlPath)
+			return obj
+
+	def previousURLPaths(self):
+		"""Return the list of all previous URL paths."""
+		return [s[1] for s in self._stack]
 
 	def rawInput(self, rewind=False):
 		"""Get the raw input from the request.
 
-		This gives you a file-like object for the data that was
-		sent with the request (e.g., the body of a POST request,
-		or the documented uploaded in a PUT request).
-
-		The file might not be rewound to the beginning if there
-		was valid, form-encoded POST data. Pass rewind=True if
-		you want to be sure you get the entire body of the request.
+		This gives you a file-like object for the data that was sent with
+		the request (e.g., the body of a POST request, or the document
+		uploaded in a PUT request).
+
+		The file might not be rewound to the beginning if there was valid,
+		form-encoded POST data. Pass rewind=True if you want to be sure
+		you get the entire body of the request.
 
 		"""
 		fs = self.fieldStorage()
@@ -625,21 +646,22 @@
 		return self._environ.get('SCRIPT_FILENAME', '')
 
 	def contextPath(self):
-		"""Return the portion of the request URI that is the context of the request."""
+		"""Return the portion of the URI that is the context of the request."""
 		return self._serverSideContextPath
 
 	def pathInfo(self):
-		"""Return any extra path information associated with the URL the client sent with this request.
+		"""Return any extra path information as sent by the client.
 
+		This is anything after the servlet name but before the query string.
 		Equivalent to CGI variable PATH_INFO.
 
 		"""
 		return self._environ.get('PATH_INFO', '')
 
 	def pathTranslated(self):
-		"""Return any extra path information after the servlet name but before the query string.
+		"""Return extra path information translated as file system path.
 
-		The path is translated to a file system path.
+		This is the same as pathInfo() but translated to the file system.
 		Equivalent to CGI variable PATH_TRANSLATED.
 
 		"""
@@ -706,7 +728,8 @@
 		if force:
 			# Force this session ID to exist, so that a random session ID
 			# won't be created in case it's a new session.
-			self._transaction.application().createSessionWithID(self._transaction, sessionID)
+			self._transaction.application().createSessionWithID(
+				self._transaction, sessionID)
 
 	def hasPathSession(self):
 		return self._pathSession is not None
@@ -723,8 +746,8 @@
 		Return a list of tuples where each tuple has a key/label (a string)
 		and a value (any kind of object).
 
-		Values are typically atomic values such as numbers and strings
-		or another list of tuples in the same fashion. This is for debugging only.
+		Values are typically atomic values such as numbers and strings or
+		another list of tuples in the same fashion. This is for debugging only.
 
 		"""
 		# @@ 2000-04-10 ce: implement and invoke super if appropriate
@@ -767,8 +790,8 @@
 		return ''.join(res)
 
 	exceptionReportAttrNames = Request.exceptionReportAttrNames + (
-		'uri servletPath serverSidePath pathInfo pathTranslated'
-		' queryString method sessionId parents fields cookies environ'.split())
+		'uri servletPath serverSidePath pathInfo pathTranslated queryString'
+		' method sessionId previousURLPaths fields cookies environ'.split())
 
 
 	## Deprecated ##
@@ -778,7 +801,7 @@
 
 		Use serverSidePath() instead.@
 
-		Return the directory of the Servlet (as given through __init__()'s path).
+		Return the servlet directory (as given through __init__()'s path).
 
 		"""
 		self.deprecated(self.serverSideDir)
@@ -791,8 +814,8 @@
 
 		Use serverSidePath() instead.@
 
-		Return a new path which includes the servlet's path appended by 'joinPath'.
-		Note that if 'joinPath' is an absolute path, then only 'joinPath' is returned.
+		Return a new path with the servlet's path appended by 'joinPath'.
+		If 'joinPath' is an absolute path, then only 'joinPath' is returned.
 
 		"""
 		self.deprecated(self.relativePath)
@@ -812,7 +835,6 @@
 	HTTPRequest.sessionId
 )
 
-
 def htmlInfo(info):
 	"""Return a single HTML string that represents the info structure.
 

Modified: Webware/trunk/WebKit/Testing/DebugPage.py
==============================================================================
--- Webware/trunk/WebKit/Testing/DebugPage.py	(original)
+++ Webware/trunk/WebKit/Testing/DebugPage.py	Fri Mar 23 12:18:26 2007
@@ -4,20 +4,21 @@
 
 	def getstate(self):
 		_evars = ('PATH_INFO', 'REQUEST_URI', 'SCRIPT_NAME')
-		_pvars = ('_absolutepath', '_adapterName',
-			'_contextName', '_extraURLPath',  '_originalURLPath',
-			'_serverSidePath', '_serverSideContextPath')
+		_pvars = ('urlPath', 'previousURLPaths',
+			'adapterName', 'contextName',
+			'serverSidePath', 'serverSideContextPath',
+			'extraURLPath')
 		req = self.request()
 		env = req._environ
 		rv = []
 		for key in _evars:
 			rv.append("  * env['%s'] = %s"
-				% (key, env.get(key, "* no def *")))
+				% (key, env.get(key, "* not set *")))
 		for key in _pvars:
-			rv.append("  * req.%s = %s"
-				% (key, getattr(req, key, "* no def *")))
+			rv.append("  * req.%s() = %s"
+				% (key, getattr(req, key)()))
 		return '\n'.join(rv)
 
 	def writeContent(self):
-		self.writeln('<h2><tt>%s</tt></h2>' % self.__class__.__name__ )
+		self.writeln('<h2><tt>%s</tt></h2>' % self.__class__.__name__)
 		self.writeln('<pre>%s</pre>' % self.getstate())

Modified: Webware/trunk/WebKit/Testing/Dir/Forward3.py
==============================================================================
--- Webware/trunk/WebKit/Testing/Dir/Forward3.py	(original)
+++ Webware/trunk/WebKit/Testing/Dir/Forward3.py	Fri Mar 23 12:18:26 2007
@@ -3,4 +3,4 @@
 class Forward3(HTTPServlet):
 
 	def respond(self, trans):
-		trans.application().forward(trans, '../Forward3Target' + trans.request().extraURLPath() )
+		trans.application().forward(trans, '../Forward3Target' + trans.request().extraURLPath())

Modified: Webware/trunk/WebKit/Testing/Forward1.py
==============================================================================
--- Webware/trunk/WebKit/Testing/Forward1.py	(original)
+++ Webware/trunk/WebKit/Testing/Forward1.py	Fri Mar 23 12:18:26 2007
@@ -3,4 +3,4 @@
 class Forward1(HTTPServlet):
 
 	def respond(self, trans):
-		trans.application().forward(trans, 'Forward1Target' + trans.request().extraURLPath() )
+		trans.application().forward(trans, 'Forward1Target' + trans.request().extraURLPath())

Modified: Webware/trunk/WebKit/Testing/Forward2.py
==============================================================================
--- Webware/trunk/WebKit/Testing/Forward2.py	(original)
+++ Webware/trunk/WebKit/Testing/Forward2.py	Fri Mar 23 12:18:26 2007
@@ -3,4 +3,4 @@
 class Forward2(HTTPServlet):
 
 	def respond(self, trans):
-		trans.application().forward(trans, 'Dir/Forward2Target' + trans.request().extraURLPath() )
+		trans.application().forward(trans, 'Dir/Forward2Target' + trans.request().extraURLPath())

Modified: Webware/trunk/WebKit/Testing/IncludeURLTest.py
==============================================================================
--- Webware/trunk/WebKit/Testing/IncludeURLTest.py	(original)
+++ Webware/trunk/WebKit/Testing/IncludeURLTest.py	Fri Mar 23 12:18:26 2007
@@ -82,6 +82,7 @@
 		w("serverSideContextPath(): %s" % req.serverSideContextPath())
 		w("extraURLPath():          %s" % req.extraURLPath())
 		w("urlPath():               %s" % req.urlPath())
+		w("previousURLPaths():      %s" % ', '.join(req.previousURLPaths()))
 		w("adapterName():           %s" % req.adapterName())
 		w("Environment:" )
 		w("REQUEST_URI:             %s" % env.get('REQUEST_URI', ''))

Author: chrisz
Date: Fri Mar 23 04:54:05 2007
New Revision: 6348

Modified:
   Webware/trunk/WebKit/Docs/Future.txt

Log:
Updated doc with future plans.

Modified: Webware/trunk/WebKit/Docs/Future.txt
==============================================================================
--- Webware/trunk/WebKit/Docs/Future.txt	(original)
+++ Webware/trunk/WebKit/Docs/Future.txt	Fri Mar 23 04:54:05 2007
@@ -6,6 +6,7 @@
 :Version: X.Y
 :Released: @@/@@/@@
 
+
 Warning
 =======
 
@@ -20,6 +21,7 @@
 __ http://sourceforge.net/tracker/?group_id=4866
 __ http://www.webwareforpython.org
 
+
 Future Work/Limitations
 =======================
 
@@ -33,106 +35,161 @@
 as to when/if they'll be realized. The Python WebKit is open source,
 so feel free to jump in!
 
+
 Known Bugs
 ----------
 
 All major known bugs that existed previously have been fixed.
 
+
 To Do
 -----
 
+
 Major Items
 ~~~~~~~~~~~
+
+* Drop backward compatibility down to Python 2.0 and require Python 2.3
+  or Python 2.4 instead. Make use of the new Python features like new-style
+  classes, properties, sets, decorators etc. and get rid of old garbage and
+  workarounds for old Python versions.
+
+* Use distutils instead of our own installer, use Python eggs instead of
+  our own plug-in concept.
+
 * CheckSource.py: A program to check the source code conventions.
+
 * Role-based security and user-authentication. Goal is to eliminate,
   as much as possible, developer-written security logic.
   This should be provided by the WebKit and be configurable.
+
 * Write a custom adaptor for Apache, Netscape, MS, etc.
+
 * Distribution and load balancing.
+
 * Fault tolerance.
+
 * More sophisticated admin tools including password protection,
   clearing logs, displaying a maximum of information at a time, etc.
   Consider using module 'resource'.
+
 * Investigate case insensitive URLs, especially for the Windows platform.
+
 * Plug-ins:
+
   * In ExamplePage, automatically support examples of any plug-in
   * Better docs
   * Properties.config. 'Load', 0, 1 or the name of the required op sys
 
+
 General
 ~~~~~~~
+
 * Hunt down: ``@@`` tags (which signify "To Be Done"s), ``FUTURE`` items
   in class doc strings, ``NotImplementedErrors``, ``--`` tags
+
 * Code clean up.
+
 * Right now, if the Application itself (as opposed to Servlets) throws
   an exception, it doesn't get captured nicely. However, it is displayed
   in the app server's console.
+
 * The exception handler is pretty nice and has features like logging,
   e-mail, gathering debugging info, etc.
   However, on occasions it can throw exceptions too.
   There should be a simpler, secondary exception handler for when this happens.
+
 * Review the timestamp caching logic and its relation to .pyc files if any.
+
 * Add "Last-modified:" to generic files that are served via WebKit.
+
 * If a Python file has only one class that inherits from Servlet,
   then use that as the Servlet class
   (rather than requiring the name be the same as the file).
 
+
 Testing
 ~~~~~~~
+
 * Provide testing web page where people can report their testing results
   including version numbers, etc.
+
 * Provide higher level automation of testing. For example, a testing script
   should be able to launch various app servers multiple times.
+
 * Provide highly automated benchmarking so we can track changes in performance.
+
 * Expand the regression test suite.
 
+
 Docs
 ~~~~
+
 * Add a Getting Started Guide and a Screencast.
+
 * Beef up the User's Guide and Tutorial.
+
 * User's Guide: Create a caching section to discuss the virtues of doing so
   (the Color example became 12 X faster on the server side).
 
+
 Food for thought, considerations, reviews
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 * Consider including FormKit, FunFormKit or FormEncode:
   A plug-in to aid the construction and validation of forms.
+
 * Consider adding a simple helper lib for generating HTML
   (such as SimpleHTMLGen) to the WebUtils package.
+
 * Support `WSGI <http://www.python.org/dev/peps/pep-0333/>`__.
+
 * Consider this statement from the FastCGI docs:
   "Redirects are handled similar to CGI. Location headers with values
   that begin with "/" are treated as internal-redirects; otherwise,
   they are treated as external redirects (302)."
+
 * FastCGI app server:
   The idea is that if the app server itself supports FastCGI,
   then it can be used directly with FastCGI enabled web servers
   sans the infamous "adapter".
   Dan Green has brought this up in Webware-discuss.
+
 * Consider if we need to support ``<form action="x.py?a=1" method="post">``
   where you will have both a query string and posted data.
+
 * Application modifies sys.path so that servlets can say
   ``from SuperServlet import SuperServlet`` where SuperServlet is located in
   the same directory as the Servlet. We'd prefer a more sophisticated technique
   which does not modify sys.path and does not affect other servlets. (Or maybe
   this would go away with a new one-process-per-application architecture.)
 
+
 Check out
 ~~~~~~~~~
+
 * `Python Paste <http://pythonpaste.org>`__
-* `Django <http://www.djangoproject.com>`__
-* `TurboGears <http://www.turbogears.org>`__
-* `Pylons <http://pylonshq.com>`__
-* `web.py <http://webpy.org>`__
+
+* `Django <http://www.djangoproject.com>`__,
+  `TurboGears <http://www.turbogears.org>`__,
+  `Pylons <http://pylonshq.com>`__,
+  `web.py <http://webpy.org>`__
+
 * `Aquarium <http://aquarium.sourceforge.net>`__
+
 * http://www.zope.org/Members/Amos/WhatIsAcquisition
+
 * http://www.zope.org/Members/jim/Info/IPC8/AcquisitionAlgebra/index.html
+
 * FastCGI related: http://www.tfarmbruster.com/fcgi_sa.htm
 
+
 Down the road
 ~~~~~~~~~~~~~
+
 * Multi-language support/localization (e.g., vend data to clients
   in their preferred written language)
+
 * Consider CORBA standard RMI-IIOP and it's potential interaction with WebKit.
   This technology has been marked for inclusion in J2EE. I imagine the idea
   might be that an app server could be used by more than just web browsers.

Author: chrisz
Date: Fri Mar 23 04:53:07 2007
New Revision: 6347

Modified:
   Webware/trunk/MiscUtils/NamedValueAccess.py

Log:
Code and docstring cleanup.

Modified: Webware/trunk/MiscUtils/NamedValueAccess.py
==============================================================================
--- Webware/trunk/MiscUtils/NamedValueAccess.py	(original)
+++ Webware/trunk/MiscUtils/NamedValueAccess.py	Fri Mar 23 04:53:07 2007
@@ -19,7 +19,6 @@
 
 * Should the valueForKey() function provide for caching of bindings in
   the same manner than the mix-in does?
-
   If not, should the mix-in allow an option to *not* cache bindings?
 
 * hasValueForKey() function? (We already have a method in the mix-in)
@@ -29,15 +28,13 @@
 	* Use NoDefault instead of None in the parameters
 	* Revisit doc string and test cases
 
-* Docs: More improvs to doc strings.
-
 * Testing: increase coverage
 
 * Rename? class NamedValueAccess+ible:
 
 * Benchmarking: Set this up in a new file:
 	Testing/BenchNamedValueAccess.py
-  so we can experment with caching vs. not and other techniques.
+   so we can experiment with caching vs. not and other techniques.
 
 
 PAST DESIGN DECISIONS
@@ -54,12 +51,11 @@
 
 Chuck Esterbrook <echuck@...>
 Tavis Rudd <tavis@...>
+
 """
 
 
 import types
-import string, sys
-from time import time
 from MiscUtils import NoDefault
 
 
@@ -75,79 +71,86 @@
 
 
 class NamedValueAccess:
-	"""
+	"""Mix-in class for accessing Python objects by named attributes.
+
 	This class is intended to be ancestor class such that you can say:
 		from NamedValueAccess import *
 		age = someObj.valueForName("age")
 		name = someObj.valueForName("info.fields.name")
 
-	This can be useful in setups where you wish to textually refer to the objects
-	in a program, such as an HTML template processed in the context of an
-	object-oriented framework.
+	This can be useful in setups where you wish to textually refer to the
+	objects in a program, such as an HTML template processed in the context
+	of an object-oriented framework.
 
-	Keys can be matched to either methods or ivars and with or without underscores.
+	Keys can be matched to either methods or instance variables and with
+	or without underscores.
 
 	valueForName() can also traverse bona fide dictionaries (DictType).
 
-	You can safely import * from this module. Only the NamedValueAccess class is exported
-	(other than typical things like string and sys).
+	You can safely import * from this module.
+	Only the NamedValueAccess class is exported.
 
 	There is no __init__() method and never will be.
 
-	You can run the test suite by running this module as a program.
-
-	You'll see the terms 'key' and 'name' in the class and its documentation. A 'key'
-	is a single identifier such as 'foo'. A name could be key, or a qualified key,
-	such as 'foo.bar.boo'. Names are generally more convenient and powerful, while
-	key-oriented methods are more efficient and provide the atomic functionality that
-	name-oriented methods are built upon. From a usage point of view, you normally
-	just use the 'name' methods and forget about the 'key'.
+	You'll see the terms 'key' and 'name' in the class and its documentation.
+	A 'key' is a single identifier such as 'foo'. A name could be key, or a
+	qualified key, such as 'foo.bar.boo'. Names are generally more convenient
+	and powerful, while key-oriented methods are more efficient and provide
+	the atomic functionality that name-oriented methods are built upon.
+	From a usage point of view, you normally just use the 'name' methods
+	and forget about the 'key'.
 
 	@@ 2000-05-21 ce: This class causes problems when used in WebKit for logging.
 		Perhaps circular references?
 		Involving self?
 		Having to do with methods bound to their objects?
 
-	@@ 2000-03-03 ce: document ivars
+	@@ 2000-03-03 ce: document instance variables
 
 	@@ 2000-04-24 ce: Some classes like UserDict need to use getitem()
 	instead of getattr() and don't need to deal with _bindingForGetKey().
 
 	@@ 2000-05-31 ce: Rename this class to NamedValues, NamedValueAccess, ValuesByName
 
-	@@ This class probably needs to be in MiscUtils, as it's being used in that way
-	   while MiddleKit was intended for "enterprise/business objects".
+	@@ This class probably needs to be in MiscUtils, as it's being used in that
+	   way while MiddleKit was intended for "enterprise/business objects".
+
 	"""
 
-	#
-	# Accessing values by key
-	#
+
+	## Accessing values by key ##
+
 	def hasValueForKey(self, key):
-		"""	Returns true if the key is available, although that does not
-			guarantee that there will not be errors caused by retrieving the key. """
+		"""Check whether key is available.
 
-		return self._bindingForGetKey(key)!=None
+		Returns true if the key is available, although that does not guarantee
+		that there will not be errors caused by retrieving the key.
 
+		"""
+		return self._bindingForGetKey(key) != None
 
 	def valueForKey(self, key, default=NoDefault):
-		""" Suppose key is 'foo'. This method returns the value with the following precedence:
-				1. Methods before non-methods
-				2. Public attributes before private attributes
-
-			More specifically, this method then returns one of the following:
-				* self.foo()
-				* self._foo()
-				* self.foo
-				* self._foo
-
-			...or default, if it was specified,
-			otherwise invokes and returns result of valueForUnknownKey().
-			Note that valueForUnknownKey(), normally returns an exception.
+		"""Get value for given key.
 
-			See valueForName() which is a more advanced version of this method that allows
-			multiple, qualified keys.
-		"""
+		Suppose key is 'foo'.
+		This method returns the value with the following precedence:
+			1. Methods before non-methods
+			2. Public attributes before private attributes
+
+		More specifically, this method then returns one of the following:
+			* self.foo()
+			* self._foo()
+			* self.foo
+			* self._foo
+
+		... or default, if it was specified,
+		otherwise invokes and returns result of valueForUnknownKey().
+		Note that valueForUnknownKey() normally returns an exception.
 
+		See valueForName() which is a more advanced version of this method
+		that allows multiple, qualified keys.
+
+		"""
 		binding = self._bindingForGetKey(key)
 
 		if not binding:
@@ -157,20 +160,16 @@
 				return default
 
 		if type(binding) is types.MethodType:
-# @@ 2000-05-07 ce: come to a decision on exception handling for key errors
-#			try:
 			if technique:
 				result = binding(self)
 			else:
 				result = binding()
-#			except:
-				# @@ 2000-02-18: Improve next line with exception info
-#				raise NamedValueAccessError, 'Caught exception while accessing key (%s). Exception is %s' % (key, sys.exc_info())
 			return result
 		else:
 			return getattr(self, binding)
 
 	def hasValueForName(self, keysString):
+		"""Check whether name is available."""
 		try:
 			value = self.valueForName(keysString)
 		except NamedValueAccessError:
@@ -178,55 +177,70 @@
 		return 1
 
 	def valueForName(self, keysString, default=None):
-		""" Returns the value for the given keysString. This is the more advanced version of
-			valueForKey(), which can only handle single names. This method can handle
-			'foo', 'foo1.foo2', 'a.b.c.d', etc. It will traverse dictionaries if needed. """
-		keys = string.split(keysString, '.')
+		"""Get the value for the given keysString.
+
+		This is the more advanced version of valueForKey(), which can only
+		handle single names. This method can handle
+			'foo', 'foo1.foo2', 'a.b.c.d', etc.
+		It will traverse dictionaries if needed.
+		"""
+		keys = keysString.split('.')
 		return self.valueForKeySequence(keys, default)
 
 	def valueForKeySequence(self, listOfKeys, default=None):
-		# @@ 2000-02-18: document
+		"""Get the value for the given list of keys."""
 		return _valueForKeySequence(self, listOfKeys, default)
 
 	def valuesForNames(self, keys, default=None, defaults=None, forgive=0, includeNames=0):
-		""" Returns a list of values that match the given keys, each of which is passed
-			  through valueForName() and so could be of the form 'a.b.c'.
-			keys is a sequence. default is any kind of object. defaults is a sequence.
-			  forgive and includeNames is a flag.
-			If default is not None, then it is substituted when a key is not found.
-			Otherwise, if defaults is not None, then it's corresponding/parallel value
-			  for the current key is substituted when a key is not found.
-			Otherwise, if forgive=1, then unknown keys simply don't produce any values.
-			Otherwise, if default and defaults are None, and forgive=0, then the unknown
-			  keys will probably raise an exception through self.valueForUnknownKey() although
-			  that method can always return a final, default value.
-			if keys is None, then None is returned. If keys is an empty list, then None
-			  is returned.
-			Often these last four arguments are specified by key.
-			Examples:
-				names = ['origin.x', 'origin.y', 'size.width', 'size.height']
-				obj.valuesForNames(names)
-				obj.valuesForNames(names, default=0.0)
-				obj.valuesForNames(names, defaults=[0.0, 0.0, 100.0, 100.0])
-				obj.valuesForNames(names, forgive=0)
-			@@ 2000-03-04 ce: includeNames is only supported when forgive=1.
-				It should be supported for the other cases.
-				It should be documented.
-				It should be included in the test cases.
-		"""
+		"""Get all values for given names.
 
+		Returns a list of values that match the given keys, each of which is
+		passed through valueForName() and so could be of the form 'a.b.c'.
+
+		keys and defaults are sequences.
+		default is any kind of object.
+		forgive and includeNames are flags.
+
+		If default is not None, then it is substituted when a key is not found.
+		Otherwise, if defaults is not None, then it's corresponding/parallel
+		value for the current key is substituted when a key is not found.
+		Otherwise, if forgive is true, then unknown keys simply don't produce
+		any values.
+		Otherwise, if default and defaults are None, and forgive is false,
+		then the unknown keys will probably raise an exception through
+		self.valueForUnknownKey() although that method can always return
+		a final, default value.
+		if keys is None, then None is returned.
+		If keys is an empty list, then None is returned.
+		Often these last four arguments are specified by key.
+		Examples:
+			names = ['origin.x', 'origin.y', 'size.width', 'size.height']
+			obj.valuesForNames(names)
+			obj.valuesForNames(names, default=0.0)
+			obj.valuesForNames(names, defaults=[0.0, 0.0, 100.0, 100.0])
+			obj.valuesForNames(names, forgive=0)
+		@@ 2000-03-04 ce: includeNames is only supported when forgive=1.
+			It should be supported for the other cases.
+			It should be documented.
+			It should be included in the test cases.
+
+		"""
 		if keys is None:
 			return None
-		if len(keys) is 0:
+		if len(keys) == 0:
 			return []
 		results = []
 
 		if default is not None:
-			results = map(lambda key, myself=self, mydefault=default: myself.valueForName(key, mydefault), keys)
+			results = map(lambda key, myself=self,
+				mydefault=default: myself.valueForName(key, mydefault), keys)
 		elif defaults is not None:
 			if len(keys) is not len(defaults):
-				raise NamedValueAccessError, 'Keys and defaults have mismatching lengths (%d and %d).' % (len(keys), len(defaults))
-			results = map(lambda key, default, myself=self: myself.valueForName(key, default), keys, defaults)
+				raise NamedValueAccessError, \
+					'Keys and defaults have mismatching lengths (%d and %d).' \
+					% (len(keys), len(defaults))
+			results = map(lambda key, default,
+				myself=self: myself.valueForName(key, default), keys, defaults)
 		elif forgive:
 			results = []
 			uniqueObject = 'uni' + 'que'
@@ -239,44 +253,48 @@
 						results.append(value)
 		else:
 			# no defaults, no forgiveness
-			results = map(lambda key, myself=self: myself.valueForName(key), keys)
+			results = map(lambda key,
+				myself=self: myself.valueForName(key), keys)
 		return results
 
 	def setValueForKey(self, key, value):
-		# @@ 2000-02-18: naming might be weired here with args reversed
-		""" Suppose key is 'foo'. This method sets the value with the following precedence:
-				1. Public attributes before private attributes
-				2. Methods before non-methods
+		"""Set value for a given key.
+
+		Suppose key is 'foo'.
+		This method sets the value with the following precedence:
+			1. Public attributes before private attributes
+			2. Methods before non-methods
+
+		More specifically, this method then uses one of the following:
+			@@ 2000-03-04 ce: fill in
 
-			More specifically, this method then uses one of the following:
-				@@ 2000-03-04 ce: fill in
+		... or invokes handleUnknownSetKey().
 
-			...or invokes handleUnknownSetKey().
 		"""
 		raise NotImplementedError # @@ 2000-03-04 ce
 
 	def resetKeyBindings(self):
-		# @@ 2000-02-18 document this method
+		"""Rest all key bindings, releasing alreaedy referenced values."""
 		if hasattr(self, '_kvGetBindings'):
 			self._kvGetBindings = {}
 
 
-	#
-	# Errors
-	#
+	## Errors ##
+
 	def valueForUnknownKey(self, key, default):
 		raise NamedValueAccessError, key
 
-	#def handleUnknownSetKey(self, key):
-	#	raise NamedValueAccessError, key
+	def handleUnknownSetKey(self, key):
+		raise NamedValueAccessError, key
+
 
+	## Private ##
 
-	#
-	# Private
-	#
 	def _bindingForGetKey(self, key):
-		"""	Bindings are cached.
-			Bindings are methods or strings.
+		"""Get binding for given key.
+
+		Bindings are cached. Bindings are methods or strings.
+
 		"""
 
 		# Make _kvGetBindings dictionary if we don't have one
@@ -294,20 +312,18 @@
 		# Try plain old key
 		if hasattr(self, key):
 			found = getattr(self, key)
-			#print '0: found = ', found, type(found)
 			if type(found) is not types.MethodType:
 				found = key
 			elif technique:
 				found = getattr(self.__class__, key)
 			self._kvGetBindings[key] = found
-		#print '1: found = ', found, type(found)
 
 		# Try _key only if we didn't find a method called key
 		if type(found) is not types.MethodType:
 			underKey = '_' + key
 			if hasattr(self, underKey):
 				underAttr = getattr(self, underKey)
-				if found==None:
+				if found is None:
 					if type(underAttr) is types.MethodType:
 						if technique:
 							value = getattr(self.__class__, underKey)
@@ -322,13 +338,12 @@
 							underAttr = getattr(self.__class__, underKey)
 						found = self._kvGetBindings[key] = underAttr
 
-		#print '2: found = ', found, type(found)
-
 		return found
 
 
 class NamedValueAccessWrapper(NamedValueAccess):
-	"""
+	"""Mix-in class for accessing Python objects by named attributes.
+
 	This provides a wrapper around an existing object which will respond
 	to the methods of NamedValueAccess. By using the wrapper, you can
 	stick with objects and methods such as obj.valueForName('x.y') (as
@@ -338,6 +353,7 @@
 	Example:
 		wrapper = NamedValueAccessWrapper(obj)
 		print wrapper.valueForName('manager.name')
+
 	"""
 
 	def __init__(self, object):
@@ -358,15 +374,16 @@
 		return valueForName(self._object)
 
 
-
-#
-# Private
-#
+## Private ##
 
 def _valueForKeySequence(obj, listOfKeys, default=None):
-	"""	This is a recursive function used to implement NamedValueAccess.valueForKeySequence.
-		Besides supporting inheritors of NamedValueAccess, this function also supports
-		dictionaries, which is why it's not found in the class.
+	"""Get the value of an object for a given list of keys.
+
+	This is a recursive function used to implement
+	NamedValueAccess.valueForKeySequence.
+	Besides supporting inheritors of NamedValueAccess, this function also
+	supports dictionaries, which is why it's not found in the class.
+
 	"""
 
 	# @@ 2000-02-18: Optimize by specifying index instead of making new list
@@ -375,30 +392,33 @@
 			value = obj[listOfKeys[0]]
 		except: # @@ 2000-03-03 ce: this exception should be more specific. probably nameerror or indexerror
 			if default is None:
-				raise NamedValueAccessError, 'Unknown key (%s) in dictionary.' % listOfKeys[0]
+				raise NamedValueAccessError, \
+					'Unknown key (%s) in dictionary.' % listOfKeys[0]
 			else:
 				return default
 	else:
 		value = obj.valueForKey(listOfKeys[0], default)
-	if len(listOfKeys)>1:
+	if len(listOfKeys) > 1:
 		return _valueForKeySequence(value, listOfKeys[1:], default)
 	else:
 		return value
 
 
 def _dict_valueForKey(obj, key, default=NoDefault):
-	"""
+	"""Get the value of a dict-like object for a given key.
+
 	Returns the value for a given key of the dictionary-like object.
 	This is a private, custom function built in support of valueForKey().
+
 	"""
 	try:
 		value = obj[key]
 	except AttributeError, e:
 		# We attempt to pass only on exceptions caused
-		# by obj not responding to __getitem__. Any
-		# other exceptions generated get raised up.
+		# by obj not responding to __getitem__.
+		# Any other exceptions generated get raised up.
 		substring = "instance has no attribute '__getitem__'"
-		if e.args[0][-len(substring):]==substring:
+		if e.args[0][-len(substring):] == substring:
 			if default is NoDefault:
 				return None
 			else:
@@ -406,7 +426,7 @@
 		else:
 			raise
 	except KeyError, e:
-		if e.args[0]==key:
+		if e.args[0] == key:
 			if default is NoDefault:
 				raise ValueForKeyError, key
 			else:
@@ -420,11 +440,10 @@
 
 
 def valueForKey(obj, key, default=NoDefault):
-	"""
-	Returns the value of the object named by the given key.
+	"""Get the value of the object named by the given key.
 
-	Suppose key is 'foo'. This method returns the value with the
-	following precedence:
+	Suppose key is 'foo'.
+	This method returns the value with the following precedence:
 		1. Methods before non-methods
 		2. Attributes before keys (__getitem__)
 		3. Public things before private things
@@ -459,10 +478,11 @@
 
 	* See valueForName() which is a more advanced version of this
 	  function that allows multiple, qualified keys.
+
 	"""
 
 	assert obj is not None
-	
+
 	# We only accept strings for keys
 	assert type(key) is types.StringType
 
@@ -522,23 +542,24 @@
 	if valueForUnknownKey:
 		return valueForUnknownKey(key, default)
 
-	if default!=NoDefault:
+	if default != NoDefault:
 		return default
 	else:
 		raise ValueForKeyError, key
 
 
 def valueForName(obj, name, default=NoDefault):
-	"""
-	Returns the value of the object that is named. The name can use
-	dotted notation to traverse through a network/graph of objects.
-	Since this function relies on valueForKey() for each individual
-	component of the name, you should be familiar with the semantics
-	of that notation.
+	"""Get the value of the object that is named.
+
+	The name can use dotted notation to traverse through a network/graph
+	of objects. Since this function relies on valueForKey() for each
+	individual component of the name, you should be familiar with the
+	semantics of that notation.
 
 	Example: valueForName(obj, 'department.manager.salary')
+
 	"""
-	names = string.split(name, '.')
+	names = name.split('.')
 	for name in names:
 		obj = valueForKey(obj, name, default)
 		if obj is default:
@@ -556,7 +577,7 @@
 def _enhanceUserDict():
 	from UserDict import UserDict
 	if not NamedValueAccess in UserDict.__bases__:
-		UserDict.__bases__ = UserDict.__bases__ + (NamedValueAccess,)
+		UserDict.__bases__ += (NamedValueAccess,)
 
 		def _UserDict_hasValueForKey(self, key):
 			return self.has_key(key)

Author: chrisz
Date: Fri Mar 23 03:37:59 2007
New Revision: 6346

Modified:
   Webware/trunk/WebKit/Application.py

Log:
Make sure servlets are always returned to their pool.

Modified: Webware/trunk/WebKit/Application.py
==============================================================================
--- Webware/trunk/WebKit/Application.py	(original)
+++ Webware/trunk/WebKit/Application.py	Fri Mar 23 03:37:59 2007
@@ -545,16 +545,18 @@
 				return
 		servlet = None
 		try:
-			servlet = self._rootURLParser.findServletForTransaction(trans)
-			self.runTransactionViaServlet(servlet, trans)
-		except HTTPExceptions.HTTPException, err:
-			err.setTransaction(trans)
-			trans.response().displayError(err)
-		except EndResponse:
-			pass
-		if servlet:
-			# Return the servlet to its pool
-			self.returnServlet(servlet, trans)
+			try:
+				servlet = self._rootURLParser.findServletForTransaction(trans)
+				self.runTransactionViaServlet(servlet, trans)
+			except HTTPExceptions.HTTPException, err:
+				err.setTransaction(trans)
+				trans.response().displayError(err)
+			except EndResponse:
+				pass
+		finally:
+			if servlet:
+				# Return the servlet to its pool
+				self.returnServlet(servlet, trans)
 
 	def runTransactionViaServlet(self, servlet, trans):
 		"""Execute the transaction using the servlet.

Author: chrisz
Date: Fri Mar 23 03:31:16 2007
New Revision: 6345

Modified:
   Webware/trunk/WebKit/HTTPRequest.py
   Webware/trunk/WebKit/Request.py

Log:
Since clearTransaction is defined in Request, the other transaction methods should also be defined there.

Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py	(original)
+++ Webware/trunk/WebKit/HTTPRequest.py	Fri Mar 23 03:31:16 2007
@@ -118,7 +118,6 @@
 			dict[key] = self._cookies[key].value
 		self._cookies = dict
 
-		self._transaction = None
 		self._serverRootPath = self._extraURLPath = ''
 		self._cookieSession = self._pathSession = None
 		self._sessionExpired = False
@@ -139,12 +138,9 @@
 	def responseClass(self):
 		return HTTPResponse.HTTPResponse
 
-	def transaction(self):
-		return self._transaction
-
 	def setTransaction(self, trans):
 		"""Should be invoked after the transaction is created for this request."""
-		self._transaction = trans
+		Request.setTransaction(self, trans)
 		self._sidname = trans.application()._session_name
 		# Get session ID from cookie if available
 		self._cookieSession = self._cookies.get(self._sidname, None)

Modified: Webware/trunk/WebKit/Request.py
==============================================================================
--- Webware/trunk/WebKit/Request.py	(original)
+++ Webware/trunk/WebKit/Request.py	Fri Mar 23 03:31:16 2007
@@ -28,6 +28,7 @@
 	def __init__(self):
 		"""Subclasses are responsible for invoking super and initializing self._time."""
 		Message.__init__(self)
+		self._transaction = None
 
 
 	## Access ##
@@ -117,6 +118,22 @@
 		"""
 		return 0
 
+
+	## Transactions ##
+
+	def responseClass(self):
+		"""Get the corresponding response class."""
+		raise NotImplementedError
+
+	def setTransaction(self, trans):
+		"""Set a transaction container."""
+		self._transaction = trans
+
+	def transaction(self):
+		"""Get the transaction container."""
+		return self._transaction
+
+
 	## Cleanup ##
 
 	def clearTransaction(self):

Author: chrisz
Date: Fri Mar 23 03:20:18 2007
New Revision: 6344

Modified:
   Webware/trunk/WebKit/ThreadedAppServer.py

Log:
Code cleanup.

Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py	(original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py	Fri Mar 23 03:20:18 2007
@@ -706,7 +706,6 @@
 		conn = self._sock
 		if verbose:
 			print "receiving request from", conn
-		BUFSIZE = 8*1024
 		requestDict = self.receiveDict()
 		if requestDict['format'] == "STATUS":
 			conn.send(str(self._server._requestID))
@@ -723,16 +722,14 @@
     except AttributeError:
         pass
 
-class TASASStreamOut(ASStreamOut):
+class TASStreamOut(ASStreamOut):
 	"""Response stream for ThreadedAppServer.
 
-	The `TASASStreamOut` class streams to a given socket, so that when `flush`
+	The `TASStreamOut` class streams to a given socket, so that when `flush`
 	is called and the buffer is ready to be written, it sends the data from the
 	buffer out on the socket. This is the response stream used for requests
 	generated by ThreadedAppServer.
 
-	TAS stands for ThreadedAppServer (AS for AppServer... a little redundant).
-
 	"""
 
 	def __init__(self, sock):
@@ -792,7 +789,7 @@
 	def handleRequest(self):
 		"""Handle request.
 
-		Creates the request dictionary, and creates a `TASASStreamOut` object
+		Creates the request dictionary, and creates a `TASStreamOut` object
 		for the response, then calls `Application.dispatchRawRequest`, which
 		does the rest of the work (here we just clean up after).
 
@@ -813,7 +810,7 @@
 		requestDict['input'] = self.makeInput()
 		requestDict['requestID'] = self._requestID
 
-		streamOut = TASASStreamOut(self._sock)
+		streamOut = TASStreamOut(self._sock)
 		transaction = self._server._app.dispatchRawRequest(requestDict, streamOut)
 		try:
 			streamOut.close()
@@ -836,7 +833,6 @@
 		transaction.die()
 		del transaction
 
-
 	def makeInput(self):
 		"""Create a file-like object from the socket."""
 		return self._sock.makefile("rb", 8012)

Author: chrisz
Date: Fri Mar 23 03:16:34 2007
New Revision: 6343

Modified:
   Webware/trunk/WebKit/Adapters/CGIPlus/CGIPlusLaunchWebKit.py
   Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
   Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusServer.py

Log:
Code cleanup.

Modified: Webware/trunk/WebKit/Adapters/CGIPlus/CGIPlusLaunchWebKit.py
==============================================================================
--- Webware/trunk/WebKit/Adapters/CGIPlus/CGIPlusLaunchWebKit.py	(original)
+++ Webware/trunk/WebKit/Adapters/CGIPlus/CGIPlusLaunchWebKit.py	Fri Mar 23 03:16:34 2007
@@ -1,19 +1,19 @@
-#!/$1$DKA200/TOOLS/python/vms/bin/python.exe.1
+#!/usr/bin/env python
 
 import os, sys
 
-webwarePath = '/webware092_root'
-appWorkPath = '/webware092_root'
+webwarePath = '/usr/local/Webware'
+appWorkPath = '/usr/local/Webware'
 
 
 def main(args):
 	global webwarePath, appWorkPath
 	newArgs = []
 	for arg in args:
-		if arg.startswith('--webware-path='):
-			webwarePath = arg[15:]
-		elif arg.startswith('--working-path='):
-			appWorkPath = arg[15:]
+		if arg.startswith('--webware-dir='):
+			webwarePath = arg[14:]
+		elif arg.startswith('--work-dir='):
+			appWorkPath = arg[11:]
 		else:
 			newArgs.append(arg)
 	args = newArgs

Modified: Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
==============================================================================
--- Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py	(original)
+++ Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py	Fri Mar 23 03:16:34 2007
@@ -26,8 +26,7 @@
 from WebUtils import Funcs
 
 
-
-debug = 0
+debug = False
 
 DefaultConfig = {
 	'MaxServerThreads':        1,
@@ -61,7 +60,7 @@
 		self._handler = handlerClass
 
 	def isPersistent(self):
-		return 0
+		return False
 
 	def recordPID(self):
 		"""Currently do nothing."""
@@ -104,8 +103,7 @@
 			sys.stderr = StringIO()
 
 	def shutDown(self):
-		self.running=0
-		self._shuttingdown=1  #jsl-is this used anywhere?
+		self.running = 0
 		print "CgiPlusAppServer: Shutting Down"
 		AppServer.shutDown(self)
 
@@ -136,29 +134,6 @@
 		pass
 
 
-class MonitorHandler(Handler):
-
-	protcolName = 'monitor'
-
-	def handleRequest(self):
-		verbose = self.server._verbose
-		startTime = time.time()
-		if verbose:
-			print 'BEGIN REQUEST'
-			print asclocaltime(startTime)
-		conn = self._sock
-		if verbose:
-			print 'receiving request from', conn
-		BUFSIZE = 8*1024
-		dict = self.receiveDict()
-		if dict['format'] == "STATUS":
-			conn.send(str(self.server._reqCount))
-		if dict['format'] == 'QUIT':
-			conn.send("OK")
-			conn.close()
-			self.server.shutDown()
-
-
 from WebKit.ASStreamOut import ASStreamOut
 class CPASStreamOut(ASStreamOut):
 	"""Response stream for CgiPLusAppServer.
@@ -178,7 +153,7 @@
 
 	def flush(self):
 		result = ASStreamOut.flush(self)
-		if result: ##a true return value means we can send
+		if result: # a true return value means we can send
 			reslen = len(self._buffer)
 			self._file.write(self._buffer)
 			self._file.flush()
@@ -186,49 +161,6 @@
 			self.pop(sent)
 
 
-class AdapterHandler(Handler):
-
-	protocolName = 'address'
-
-	def handleRequest(self):
-		verbose = self._server._verbose
-		self._startTime = time.time()
-		if verbose:
-			print '%5i  %s ' % (self._requestID, timestamp()['pretty']),
-
-		data = []
-		dict = self.receiveDict()
-		if dict and verbose and dict.has_key('environ'):
-			requestURI = Funcs.requestURI(dict['environ'])
-			print requestURI
-		else:
-			requestURI = None
-
-		dict['input'] = self.makeInput()
-		streamOut = TASASStreamOut(self._sock)
-		transaction = self._server._app.dispatchRawRequest(dict, streamOut)
-		streamOut.close()
-
-		try:
-			self._sock.shutdown(1)
-			self._sock.close()
-		except:
-			pass
-
-		if self._server._verbose:
-			duration = '%0.2f secs' % (time.time() - self._startTime)
-			duration = string.ljust(duration, 19)
-			print '%5i  %s  %s' % (self._requestID, duration, requestURI)
-			print
-
-		transaction._application=None
-		transaction.die()
-		del transaction
-
-	def makeInput(self):
-		return self._sock.makefile("rb",8012)
-
-
 # Set to False in DebugAppServer so Python debuggers can trap exceptions
 doesRunHandleExceptions = True
 
@@ -241,7 +173,7 @@
 	global server
 	from WebKit.CgiPlusServer import CgiPlusAppServerHandler
 	runAgain = True
-	while runAgain:  # looping in support of RestartAppServerError
+	while runAgain: # looping in support of RestartAppServerError
 		try:
 			try:
 				runAgain = False
@@ -277,7 +209,7 @@
 	sys.exit()
 
 
-def shutDown(arg1,arg2):
+def shutDown(arg1, arg2):
 	global server
 	print "Shutdown Called", asclocaltime()
 	if server:
@@ -293,9 +225,6 @@
 The AppServer is the main process of WebKit.  It handles requests for
 servlets from webservers.  ThreadedAppServer takes the following
 command line arguments: stop: Stop the currently running Apperver.
-daemon: run as a daemon If AppServer is called with no arguments, it
-will start the AppServer and record the pid of the process in
-appserverpid.txt
 """
 
 import re
@@ -304,7 +233,6 @@
 
 def main(args):
 	function = run
-	daemon = 0
 	workDir = None
 	sys.stdout = StringIO()
 	for i in args[:]:
@@ -316,8 +244,6 @@
 		elif i == "stop":
 			import AppServer
 			function=AppServer.stop
-		elif i == "daemon":
-			daemon=1
 		elif i == "start":
 			pass
 		elif i[:8] == "workdir=":

Modified: Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusServer.py
==============================================================================
--- Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusServer.py	(original)
+++ Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusServer.py	Fri Mar 23 03:16:34 2007
@@ -1,23 +1,25 @@
-import sys
-import os
+from Common import *
 import mimetools
 try:
 	from cStringIO import StringIO
 except ImportError:
 	from StringIO import StringIO
 from WebKit.CgiPlusAppServer import Handler, CPASStreamOut
-import time
 
 
 class CgiPlusHandler:
-	"""Handles incoming requests.  Recreated with every request.
-	Abstract base class.
+	"""Handle incoming requests.
+
+	Recreated with every request. Abstract base class.
+
 	"""
+
 	def __init__(self, env, rfile, wfile):
 		self.env = env
 		self.rfile = rfile
 		self.wfile = wfile
 		self._discardOutput = False
+
 	def handleRequest(self):
 		"""
 		Actually performs the request, creating the environment and
@@ -29,7 +31,7 @@
 		if self.env.has_key('CONTENT_LENGTH'):
 			length = int(self.env['CONTENT_LENGTH'])
 			if length > 0:
-				myInput = myInput + self.rfile.read(length)
+				myInput += self.rfile.read(length)
 		self.doTransaction(self.env, myInput)
 
 	def processResponse(self, data):

Author: chrisz
Date: Fri Mar 23 02:57:52 2007
New Revision: 6342

Modified:
   Webware/trunk/CGIWrapper/CGIWrapper.py

Log:
Code cleanup.

Modified: Webware/trunk/CGIWrapper/CGIWrapper.py
==============================================================================
--- Webware/trunk/CGIWrapper/CGIWrapper.py	(original)
+++ Webware/trunk/CGIWrapper/CGIWrapper.py	Fri Mar 23 02:57:52 2007
@@ -45,7 +45,7 @@
 # @@ 2000-01-14 ce: move this
 #
 if not NamedValueAccess in UserDict.__bases__:
-	UserDict.__bases__ = UserDict.__bases__ + (NamedValueAccess,)
+	UserDict.__bases__ += (NamedValueAccess,)
 
 	def _UserDict_hasValueForKey(self, key):
 		return self.has_key(key)
@@ -204,10 +204,10 @@
 			# No extension - we assume a Python CGI script
 			if filename[0] == '_':
 				# underscores denote private scripts packaged with CGI Wrapper, such as '_admin.py'
-				filename = os.path.join(pathname, filename+'.py')
+				filename = os.path.join(pathname, filename + '.py')
 			else:
 				# all other scripts are based in the directory named by the 'ScriptsHomeDir' setting
-				filename = os.path.join(pathname, self.setting('ScriptsHomeDir'), filename+'.py')
+				filename = os.path.join(pathname, self.setting('ScriptsHomeDir'), filename + '.py')
 			self._servingScript = 1
 		else:
 			# Hmmm, some kind of extension like maybe '.html'. Leave out the 'ScriptsHomeDir' and leave the extension alone
@@ -475,7 +475,9 @@
 						print self._namespace[name](info).html()
 						break
 			else:
-				self._headers = { 'Location': os.path.split(self._environ['SCRIPT_NAME'])[0] + self._environ['PATH_INFO'] }
+				self._headers = { 'Location':
+					os.path.split(self._environ['SCRIPT_NAME'])[0]
+					+ self._environ['PATH_INFO'] }
 
 			# Note the end time of the script
 			self._scriptEndTime = time()

Author: chrisz
Date: Fri Mar 23 02:56:19 2007
New Revision: 6341

Modified:
   Webware/trunk/CGIWrapper/CGIWrapper.py

Log:
Code cleanup.

Modified: Webware/trunk/CGIWrapper/CGIWrapper.py
==============================================================================
--- Webware/trunk/CGIWrapper/CGIWrapper.py	(original)
+++ Webware/trunk/CGIWrapper/CGIWrapper.py	Fri Mar 23 02:56:19 2007
@@ -10,8 +10,8 @@
 serverStartTime  = time()
 
 # Some imports
-import cgi, os, string, sys, traceback, random
-from types import *
+import cgi, os, sys, traceback, random
+from types import DictType, FloatType
 
 if '' not in sys.path:
 	sys.path.insert(0, '')
@@ -139,7 +139,7 @@
 		else:
 			config = eval(file.read())
 			file.close()
-			assert type(config) is type({})
+			assert type(config) is DictType
 			return config
 
 	def config(self):
@@ -185,7 +185,7 @@
 		if badNames:
 			print 'Content-type: text/html\n'
 			print '<html><body>'
-			print '<p>ERROR: Missing', string.join(badNames, ', ')
+			print '<p>ERROR: Missing', ', '.join(badNames)
 			print '</body></html>'
 			sys.exit(0)
 
@@ -200,9 +200,9 @@
 		pathname = os.path.split(self._environ['SCRIPT_FILENAME'])[0] # This removes the CGI Wrapper's filename part
 		filename = self._environ['PATH_INFO'][1:]
 		ext      = os.path.splitext(filename)[1]
-		if ext=='':
+		if ext == '':
 			# No extension - we assume a Python CGI script
-			if filename[0]=='_':
+			if filename[0] == '_':
 				# underscores denote private scripts packaged with CGI Wrapper, such as '_admin.py'
 				filename = os.path.join(pathname, filename+'.py')
 			else:
@@ -225,7 +225,7 @@
 			file = open(filename, 'a')
 		else:
 			file = open(filename, 'w')
-			file.write(string.join(self.setting('ScriptLogColumns'), ',')+'\n')
+			file.write(','.join(self.setting('ScriptLogColumns')) + '\n')
 		values = []
 		for column in self.setting('ScriptLogColumns'):
 			value = self.valueForName(column)
@@ -234,7 +234,7 @@
 			else:
 				value = str(value)
 			values.append(value)
-		file.write(string.join(values, ',')+'\n')
+		file.write(','.join(values) + '\n')
 		file.close()
 
 	def version(self):
@@ -310,7 +310,7 @@
 			html.append(self.htmlDebugInfo())
 
 		html.append('</body></html>')
-		return string.join(html, '')
+		return ''.join(html)
 
 	def htmlDebugInfo(self):
 		"""
@@ -337,7 +337,7 @@
 			htTitle('Environment'),   htDictionary(self._environ, {'PATH': ';'}),
 			htTitle('Ids'),           htTable(osIdTable(), ['name', 'value'])])
 
-		return string.join(html, '')
+		return ''.join(html)
 
 	def saveHTMLErrorPage(self, html):
 		"""
@@ -355,7 +355,7 @@
 		"""Construct a filename for an HTML error page, not including the 'ErrorMessagesDir' setting."""
 		return 'Error-%s-%s-%d.html' % (
 			os.path.split(self._scriptPathname)[1],
-			string.join(map(lambda x: '%02d' % x, localtime(self._scriptEndTime)[:6]), '-'),
+			'-'.join(map(lambda x: '%02d' % x, localtime(self._scriptEndTime)[:6])),
 			random.randint(10000, 99999))
 			# @@ 2000-04-21 ce: Using the timestamp & a random number is a poor technique for filename uniqueness, but this works for now
 
@@ -381,7 +381,7 @@
 		else:
 			f = open(filename, 'w')
 			f.write('time,filename,pathname,exception name,exception data,error report filename\n')
-		f.write(string.join(logline, ','))
+		f.write(','.join(logline))
 		f.write('\n')
 		f.close()
 
@@ -392,11 +392,11 @@
 		headers = self.setting('ErrorEmailHeaders')
 		msg = []
 		for key in headers.keys():
-			if key!='From' and key!='To':
+			if key != 'From' and key != 'To':
 				msg.append('%s: %s\n' % (key, headers[key]))
 		msg.append('\n')
 		msg.append(html)
-		msg = string.join(msg, '')
+		msg = ''.join(msg)
 
 		# dbg code, in case you're having problems with your e-mail
 		# open('error-email-msg.text', 'w').write(msg)
@@ -469,7 +469,7 @@
 			if self._servingScript:
 				execfile(self._scriptPathname, self._namespace)
 				for name in self.setting('ClassNames'):
-					if name=='':
+					if name == '':
 						name = os.path.splitext(self._scriptName)[0]
 					if self._namespace.has_key(name):         # our hook for class-oriented scripts
 						print self._namespace[name](info).html()
@@ -489,9 +489,9 @@
 
 			# Not really an error, if it was sys.exit(0)
 			excInfo = sys.exc_info()
-			if excInfo[0]==SystemExit:
+			if excInfo[0] == SystemExit:
 				code = excInfo[1].code
-				if code==0 or code==None:
+				if code == 0 or code == None:
 					self._errorOccurred = 0
 
 			# Clean up
@@ -554,12 +554,12 @@
 	html = ['<table width=100% border=0 cellpadding=2 cellspacing=2 bgcolor=#F0F0F0>']
 	for key in keys:
 		value = dict[key]
-		if addSpace!=None  and  addSpace.has_key(key):
+		if addSpace != None and addSpace.has_key(key):
 			target = addSpace[key]
-			value = string.join(string.split(value, target), '%s '%target)
+			value = ('%s ' % target).join(value.split(target))
 		html.append('<tr> <td> %s </td> <td> %s &nbsp;</td> </tr>\n' % (key, value))
 	html.append('</table>')
-	return string.join(html, '')
+	return ''.join(html)
 
 def osIdTable():
 	"""
@@ -590,23 +590,19 @@
 
 	if not listOfDicts:
 		return ''
-
 	if keys is None:
 		keys = listOfDicts[0].keys()
 		keys.sort()
-
 	s = '<table border=0 cellpadding=2 cellspacing=2 bgcolor=#F0F0F0>\n<tr>'
 	for key in keys:
 		s = '%s<td><b>%s</b></td>' % (s, key)
-	s = s + '</tr>\n'
-
+	s += '</tr>\n'
 	for row in listOfDicts:
-		s = s + '<tr>'
+		s += '<tr>'
 		for key in keys:
 			s = '%s<td>%s</td>' % (s, row[key])
-		s = s + '</tr>\n'
-
-	s = s + '</table>'
+		s += '</tr>\n'
+	s += '</table>'
 	return s
 
 
@@ -621,17 +617,13 @@
 		# catch exceptions here that might come from the wrapper, including
 		# ones generated while it's handling exceptions.
 		import traceback
-
 		sys.stderr.write('[%s] [error] CGI Wrapper: Error while executing script (unknown)\n' % (
 			asctime(localtime(time()))))
 		sys.stderr.write('Error while executing script\n')
 		traceback.print_exc(file=sys.stderr)
-
 		output = apply(traceback.format_exception, sys.exc_info())
-		output = string.join(output, '')
-		output = string.replace(output, '&', '&amp;')
-		output = string.replace(output, '<', '&lt;')
-		output = string.replace(output, '>', '&gt;')
+		output = ''.join(output)
+		output = output.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
 		stdout.write('''Content-type: text/html
 
 <html><body>
@@ -640,6 +632,6 @@
 </body></html>\n''' % output)
 
 
-if __name__=='__main__':
+if __name__ == '__main__':
 	isMain = 1
 	main()

Author: chrisz
Date: Fri Mar 23 02:35:27 2007
New Revision: 6340

Modified:
   Webware/trunk/Docs/Overview.phtml
   Webware/trunk/PSP/Context.py
   Webware/trunk/PSP/Generators.py
   Webware/trunk/PSP/PSPCompiler.py
   Webware/trunk/PSP/PSPParser.py
   Webware/trunk/PSP/PSPServletFactory.py
   Webware/trunk/PSP/PSPUtils.py
   Webware/trunk/PSP/ParseEventHandler.py
   Webware/trunk/PSP/ServletWriter.py
   Webware/trunk/PSP/StreamReader.py

Log:
Corrected wrong email address in docs.

Modified: Webware/trunk/Docs/Overview.phtml
==============================================================================
--- Webware/trunk/Docs/Overview.phtml	(original)
+++ Webware/trunk/Docs/Overview.phtml	Fri Mar 23 02:35:27 2007
@@ -94,8 +94,8 @@
 <tr><td valign="top">Copyright:</td><td>See the <a href="Copyright.html">Copyright, License and Disclaimer</a>.</td></tr>
 <tr><td valign="top">Primary Authors:</td><td>
 Chuck Esterbrook, <a href="mailto:chuckesterbrook@...>
-<br>Jay Love, <a href="mailto:jsliv@...>
-<br>Geoff Talvola, <a href="mailto:gtalvola@...>
+<br>Jay Love, <a href="mailto:jsliv@...>
+<br>Geoff Talvola, <a href="mailto:gtalvola@...>
 <tr><td valign="top">Other Contributors:</td><td>
 Ian Bicking, <a href="mailto:ianb@...>
 <br>Tom Schwaller, <a href="mailto:tom.schwaller@...>

Modified: Webware/trunk/PSP/Context.py
==============================================================================
--- Webware/trunk/PSP/Context.py	(original)
+++ Webware/trunk/PSP/Context.py	Fri Mar 23 02:35:27 2007
@@ -4,7 +4,7 @@
 	A utility class that holds information about the file we are parsing
 	and the environment we are doing it in.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/Generators.py
==============================================================================
--- Webware/trunk/PSP/Generators.py	(original)
+++ Webware/trunk/PSP/Generators.py	Fri Mar 23 02:35:27 2007
@@ -6,7 +6,7 @@
 	Each of these elements is put into a list maintained by the ParseEventHandler object.  When it comes
 	time to output the Source Code, each generator is called in turn to create it's source.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/PSPCompiler.py
==============================================================================
--- Webware/trunk/PSP/PSPCompiler.py	(original)
+++ Webware/trunk/PSP/PSPCompiler.py	Fri Mar 23 02:35:27 2007
@@ -1,7 +1,7 @@
 
 """A simple little module that organizes the actual page generation.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/PSPParser.py
==============================================================================
--- Webware/trunk/PSP/PSPParser.py	(original)
+++ Webware/trunk/PSP/PSPParser.py	Fri Mar 23 02:35:27 2007
@@ -4,7 +4,7 @@
 	PSP file and checking it for valid psp tokens. When it finds one,
 	it calls ParseEventHandler with the characters it found.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/PSPServletFactory.py
==============================================================================
--- Webware/trunk/PSP/PSPServletFactory.py	(original)
+++ Webware/trunk/PSP/PSPServletFactory.py	Fri Mar 23 02:35:27 2007
@@ -1,7 +1,7 @@
 
 """This module handles requests from the application for PSP pages.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/PSPUtils.py
==============================================================================
--- Webware/trunk/PSP/PSPUtils.py	(original)
+++ Webware/trunk/PSP/PSPUtils.py	Fri Mar 23 02:35:27 2007
@@ -1,7 +1,7 @@
 
 """A bunch of utility functions for the PSP generator.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/ParseEventHandler.py
==============================================================================
--- Webware/trunk/PSP/ParseEventHandler.py	(original)
+++ Webware/trunk/PSP/ParseEventHandler.py	Fri Mar 23 02:35:27 2007
@@ -6,7 +6,7 @@
 	source file is fully parsed, this module calls all of the
 	generators in turn to output their source code.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/ServletWriter.py
==============================================================================
--- Webware/trunk/PSP/ServletWriter.py	(original)
+++ Webware/trunk/PSP/ServletWriter.py	Fri Mar 23 02:35:27 2007
@@ -1,7 +1,7 @@
 
 """This module holds the actual file writer class.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Modified: Webware/trunk/PSP/StreamReader.py
==============================================================================
--- Webware/trunk/PSP/StreamReader.py	(original)
+++ Webware/trunk/PSP/StreamReader.py	Fri Mar 23 02:35:27 2007
@@ -2,7 +2,7 @@
 
 	It maintains the current position of the parser in the source file.
 
-	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
+	(c) Copyright by Jay Love, 2000 (mailto:jsliv@...)
 
 	Permission to use, copy, modify, and distribute this software and its
 	documentation for any purpose and without fee or royalty is hereby granted,

Author: chrisz
Date: Sun Mar 18 14:49:05 2007
New Revision: 6335

Modified:
   Webware/trunk/KidKit/Docs/RelNotes-X.Y.phtml
   Webware/trunk/KidKit/Docs/UsersGuide.phtml
   Webware/trunk/KidKit/Examples/Main.py
   Webware/trunk/KidKit/Examples/Welcome.kid
   Webware/trunk/KidKit/KidServletFactory.py
   Webware/trunk/KidKit/Properties.py
   Webware/trunk/WebKit/Configs/Application.config

Log:
Updated KidKit: The Homepage has changed; ElementTree is not required any more; added support for the new Kid output formatting.

Modified: Webware/trunk/KidKit/Docs/RelNotes-X.Y.phtml
==============================================================================
--- Webware/trunk/KidKit/Docs/RelNotes-X.Y.phtml	(original)
+++ Webware/trunk/KidKit/Docs/RelNotes-X.Y.phtml	Sun Mar 18 14:49:05 2007
@@ -2,39 +2,10 @@
 
 <p><% name %> version <% versionString %> released on <% releaseDate %></p>
 
-<a name="Introduction"></a><h2>Introduction</h2>
-<ul>
-	<li>...</li>
-</ul>
-
-<a name="MajorChanges"></a><h2>Major Changes</h2>
-<ul>
-	<li>...</li>
-</ul>
-
 <a name="NewFeatures"></a><h2>New Features</h2>
 <ul>
-	<li>...</li>
-</ul>
-
-<a name="Improvements"></a><h2>Improvements and Refinements</h2>
-<ul>
-	<li>...</li>
-</ul>
-
-<a name="Security"></a><h2>Security</h2>
-<ul>
-	<li>...</li>
-</ul>
-
-<a name="MinorChanges"></a><h2>Minor API Changes</h2>
-<ul>
-	<li>...</li>
-</ul>
-
-<a name="Bugfixes"></a><h2>Bugfixes</h2>
-<ul>
-	<li>...</li>
+	<li>You can now modify the Kid output formatting using the configuration
+	parameter <code>KidOutputFormat</code>.</li>
 </ul>
 
 <% footer() %>
\ No newline at end of file

Modified: Webware/trunk/KidKit/Docs/UsersGuide.phtml
==============================================================================
--- Webware/trunk/KidKit/Docs/UsersGuide.phtml	(original)
+++ Webware/trunk/KidKit/Docs/UsersGuide.phtml	Sun Mar 18 14:49:05 2007
@@ -2,8 +2,9 @@
 
 <p><% name %> version <% versionString %></p>
 
-<p>First version created by Winston Wolff, January 2005.<br>
-Improved version by Christoph Zwerschke, October 2005.</p>
+<p>Created by Winston Wolff, January 2005.<br>
+Improved version by Christoph Zwerschke, October 2005.
+Lates changes by Christoph Zwerschke, March 2007.</p>
 
 <h2>Synopsis</h2>
 
@@ -13,24 +14,16 @@
 This is very similar to the concept of Python Server Pages (PSP), but Kid provides some
 unique features making it an amazing modern alternative to PSP.</p>
 
-<p>Kid and KidKit are currently under development, so consider
-KidKit still <em>alpha</em> at the moment (August 2006).
-If you use Kid a lot, feel free to improve this component.</p>
-
 <h2>Requirements</h2>
 
 <p>Contrary to PSP, Kid itself is not included in Webware. You need to install
-the Kid package separately. Note that Kid needs the ElementTree package and
-optionally makes use of the cElementTree package (future versions of Kid may
-also utilize the xml.etree package that comes shipped with Python 2.5).</p>
+the Kid package separately.</p>
 
 <p>You can download Kid from
-<a href="http://kid.lesscode.org">kid.lesscode.org</a>,
-and ElementTree from
-<a href="http://effbot.org/downloads/#elementtree">effbot.org/downloads/#elementtree</a>.</p>
+<a href="http://www.kid-templating.org/">www.kid-templating.org/</a>.</p>
 
-<p>The current KidKit has been tested with Kid versions from 0.6 up to 0.9.3,
-and ElementTree version 1.2.6. Other versions may work as well.</p>
+<p>The current KidKit has been tested with Kid versions from 0.6 up to 0.9.5.
+Other versions may work as well.</p>
 
 <h2>Feedback</h2>
 
@@ -67,8 +60,11 @@
 
 <ul>
 <li><b>KidOutputMethod</b><br>
-The default output method for Kid. Possible values are:
+The default output method for Kid. Some possible values are:
 'xml', 'html', 'html-strict', 'xhtml' and 'xhtml-strict'.</li>
+<li><b>KidOutputMethod</b><br>
+The default output format for Kid. Some possible values are:
+'default', 'compact', 'newlines', 'pretty', 'wrap', 'nice', 'ugly', 'named'.</li>
 <li><b>CacheKidTemplates</b><br>
 Set this to False if you do not want compiled Kid templates (i.e. the
 <tt>.py</tt> or <tt>.pyc</tt> files) to be cached on disk.
@@ -96,7 +92,7 @@
 <p>In the simplest case, you can just take a Kid template file with the
 extension <tt>.kid</tt> and place it into a directory that is a valid Webware
 context. For instance, you will find the following file with the name
-<tt>Time2.kid</tt> in the <i>KidKitExamples</i> context:
+<tt>Time2.kid</tt> in the <i>KidKitExamples</i> context:</p>
 
 <pre class="py">
 &lt;?xml version='1.0' encoding='utf-8'?&gt;
@@ -214,7 +210,7 @@
 the output method for an individual template by setting the variable
 <tt>output</tt> at the global level. For instance, you could add
 the following line as first line (before the <tt>html</tt> tag) to the
-Kid template above:
+Kid template above:</p>
 
 <pre class="py">
 &lt;?python output='xhtml-strict' ?&gt;
@@ -246,8 +242,7 @@
 <h2>Credits</h2>
 
 <ul>
-<li>Kid has been developed by Ryan Tomayko (http://lesscode.org).</li>
-<li>ElementTree has been developed by Fredrik Lundh (http://effbot.org).</li>
+<li>Kid has been developed by Ryan Tomayko (rtomayko&lt;at&gt;gmail.com).</li>
 <li>KidKit was contributed to Webware in January 2005
 by Winston Wolff (winstonw&lt;at&gt;stratolab.com).
 The first version was based on the Cheetah servlet factory
@@ -257,6 +252,8 @@
 The new version is based on the PSP servlet factory.
 KidKit now supports caching and several configuration parameters
 for controlling caching, servlet hooks and output methods.</li>
+<li>Support for newer Kid versions, particularly output formatting,
+added by Christoph Zwerschke in March 2007.</li>
 </ul>
 
 <% footer() %>
\ No newline at end of file

Modified: Webware/trunk/KidKit/Examples/Main.py
==============================================================================
--- Webware/trunk/KidKit/Examples/Main.py	(original)
+++ Webware/trunk/KidKit/Examples/Main.py	Sun Mar 18 14:49:05 2007
@@ -13,10 +13,4 @@
 	def writeContent(self):
 		self.writeln('''<h4 style="color:red">Kid templates not installed.</h4>
 <p>The KidKit plug-in is based on the <tt>kid</tt> package available at
-<a href="http://kid.lesscode.org">kid.lesscode.org</a>.</p>
-<p>Please note that <tt>kid</tt> in turn requires
-the <tt>ElementTree</tt> package available at
-<a href="http://effbot.org/downloads/#elementtree">effbot.org/downloads/#elementtree</a>.</p>
-<p>You may also want to install the <tt>cElementTree</tt> package from
-<a href="http://effbot.org/downloads/#cElementTree">effbot.org/downloads/#cElementTree</a>
-in order to enhance the performance.</p>''')
+<a href="http://www.kid-templating.org">www.kid-templating.org</a>.</p>''')

Modified: Webware/trunk/KidKit/Examples/Welcome.kid
==============================================================================
--- Webware/trunk/KidKit/Examples/Welcome.kid	(original)
+++ Webware/trunk/KidKit/Examples/Welcome.kid	Sun Mar 18 14:49:05 2007
@@ -18,7 +18,7 @@
 
 <p>You are currently using Kid version
 <strong py:content="kid.__version__">(version)</strong>.
-See the <a href="http://kid.lesscode.org">Kid homepage</a>
+See the <a href="http://www.kid-templating.org">Kid homepage</a>
 for more information about Kid templates.</p>
 
 <h4 style="text-align:center">Here are some examples.</h4>

Modified: Webware/trunk/KidKit/KidServletFactory.py
==============================================================================
--- Webware/trunk/KidKit/KidServletFactory.py	(original)
+++ Webware/trunk/KidKit/KidServletFactory.py	Sun Mar 18 14:49:05 2007
@@ -1,17 +1,16 @@
 """Servlet factory for Kid templates.
 
-This allows you to run kid template files directly from within Webware.
+This allows you to run Kid template files directly from within Webware.
 Compiled templates are cached either along with the templates or in the
 Cache/KidKit subdirectory of the WebKit working directory.
 
 Note that the Kid package itself is not part of Webware; you need to install
-it separately. You also need to install the ElementTree package to use Kid.
+it separately (see http://www.kid-templating.org for more information).
 
 
 CREDITS:
 
-* Kid has been developed by Ryan Tomayko (http://lesscode.org).
-* ElementTree has been developed by Fredrik Lundh (http://effbot.org).
+* Kid has been developed by Ryan Tomayko (rtomayko<at>gmail.com).
 * KidKit was contributed by Winston Wolff (winstonw<at>stratolab.com).
   Based on the Cheetah servlet factory. No caching, fixed servlet hook.
 * Improved version contributed by Christoph Zwerschke (cito<at>online.de).
@@ -26,8 +25,13 @@
 from WebKit.Page import Page
 defaultHook = Page.respond # the default hook for Kid servlets
 defaultOutput = 'html' # the default Kid output method
+defaultFormat = 'default' # the default Kid output format
 
 from kid import load_template, output_methods
+try: # output formatting exists in newer Kid versions only
+	from kid.format import output_formats
+except:
+	output_formats = None
 from kid.compiler import KidFile
 
 from KidKit.Examples.KidExamplePage import KidExamplePage
@@ -49,6 +53,14 @@
 	except:
 		output = defaultOutput
 	assert output in output_methods
+	if output_formats is None:
+		format = None
+	else:
+		try:
+			format = module.format
+		except:
+			format = defaultFormat
+		assert format in output_formats
 
 	class KidServlet(ServletClass):
 		"""The base class for a Kid servlet."""
@@ -56,13 +68,18 @@
 		_module = module
 		_template = module.Template()
 		_output = output
+		_format = format
 
 		def writeTemplate(self, *args, **kwargs):
 			self._template.servlet = self
 			response = self._response
 			fragment = response.size() > 0
-			self._template.write(self._response,
-				fragment=fragment, output=output)
+			if format is None:
+				self._template.write(self._response,
+					fragment=fragment, output=output)
+			else:
+				self._template.write(self._response,
+					fragment=fragment, output=output, format=format)
 
 	setattr(KidServlet, writeMethod, KidServlet.writeTemplate)
 	return KidServlet
@@ -76,6 +93,8 @@
 		setting = application.setting
 		global defaultOutput # the default output method
 		defaultOutput = setting('KidOutputMethod', defaultOutput)
+		global defaultFormat # the default output format
+		defaultFormat = setting('KidOutputFormat', defaultFormat)
 		self._cacheTemplates = setting('CacheKidTemplates', True)
 		self._useCache = setting('UseKidKitCache', False)
 		if self._useCache:
@@ -111,7 +130,7 @@
 		map(os.remove, files)
 
 	def computeClassName(self, pagename):
-		"""Generates a (hopefully) unique class/file name for each Kid file.
+		"""Generate a (hopefully) unique class/file name for each Kid file.
 
 		Argument: pagename: the path to the Kid template file
 		Returns: a unique name for the class generated fom this Kid file

Modified: Webware/trunk/KidKit/Properties.py
==============================================================================
--- Webware/trunk/KidKit/Properties.py	(original)
+++ Webware/trunk/KidKit/Properties.py	Sun Mar 18 14:49:05 2007
@@ -4,7 +4,7 @@
 
 docs = [ {'name': "User's Guide", 'file': 'UsersGuide.html'} ]
 
-status = 'alpha'
+status = 'beta'
 
 requiredPyVersion = (2, 3, 0)
 
@@ -25,9 +25,8 @@
 def willRunFunc():
 	# WebKit doesn't check requiredSoftware yet. So we do so:
 	try:
-		import imp
 		for soft in requiredSoftware:
-			imp.find_module(soft['name'])
+			__import__(soft['name'])
 	except ImportError:
 		success = 0
 	else:

Modified: Webware/trunk/WebKit/Configs/Application.config
==============================================================================
--- Webware/trunk/WebKit/Configs/Application.config	(original)
+++ Webware/trunk/WebKit/Configs/Application.config	Sun Mar 18 14:49:05 2007
@@ -62,9 +62,12 @@
 # Set to True to clear the PSP cache on disk when the AppServer starts:
 ClearPSPCacheOnStart = False
 
-# The default output method for Kid. Possible values are:
+# The default output method for Kid. Some possible values are:
 # xml, html, html-strict, xhtml, xhtml-strict
 KidOutputMethod = 'html'
+# The default output format for Kid. Some possible values are:
+# default, compact, newlines, pretty, wrap, nice, ugly, named
+KidOutputMethod = 'html'
 # Set to False if you do not want compiled Kid templates to be cached on disk:
 CacheKidTemplates = True
 # Set to True if you want to use a separate KidKit file cache for the servlets,

Author: chrisz
Date: Sun Mar 18 07:49:19 2007
New Revision: 6334

Modified:
   Webware/trunk/WebKit/AppServer
   Webware/trunk/WebKit/AppServer.bat

Log:
Make it easier to change the Python executable in the app server start script.

Modified: Webware/trunk/WebKit/AppServer
==============================================================================
--- Webware/trunk/WebKit/AppServer	(original)
+++ Webware/trunk/WebKit/AppServer	Sun Mar 18 07:49:19 2007
@@ -3,6 +3,9 @@
 # WebKit application server launch script for Unix.
 # This wrapper script is needed for the AutoReload mechanism.
 
+# You may want to use a specific Python executable:
+PYTHON=python
+
 # You may give the following Python parameters in advance,
 # followed by the parameters passed on to ThreadedAppServer:
 #   -O with optimization (.pyo instead of .pyc)
@@ -19,6 +22,6 @@
 # As long as the app server returns a 3, it wants to be restarted:
 errorlevel=3
 while [ $errorlevel -eq 3 ]; do
-	/usr/bin/env python$PY_OPTS Launch.py ThreadedAppServer $*
+	$PYTHON$PY_OPTS Launch.py ThreadedAppServer $*
 	errorlevel=$?
 done

Modified: Webware/trunk/WebKit/AppServer.bat
==============================================================================
--- Webware/trunk/WebKit/AppServer.bat	(original)
+++ Webware/trunk/WebKit/AppServer.bat	Sun Mar 18 07:49:19 2007
@@ -3,6 +3,9 @@
 rem WebKit application server launch script for Windows.
 rem This wrapper script is needed for the AutoReload mechanism.
 
+rem You may want to use a specific Python executable:
+set PYTHON=python
+
 rem Check whether this is a cmd-like shell
 set CMD=cmd
 if "%~n0"=="~n0" set CMD=dos
@@ -43,7 +46,7 @@
 
 rem As long as the app server returns a 3, it wants to be restarted:
 :restart
-python%PY_OPTS% Launch.py ThreadedAppServer %ARGS%
+%PYTHON%%PY_OPTS% Launch.py ThreadedAppServer %ARGS%
 if errorlevel 3 goto restart
 
 rem Change back to old working directory:

Author: chrisz
Date: Sun Mar 18 05:53:36 2007
New Revision: 6333

Modified:
   Webware/trunk/WebKit/Testing/stress.py

Log:
Minor improvement in stress test.

Modified: Webware/trunk/WebKit/Testing/stress.py
==============================================================================
--- Webware/trunk/WebKit/Testing/stress.py	(original)
+++ Webware/trunk/WebKit/Testing/stress.py	Sun Mar 18 05:53:36 2007
@@ -89,8 +89,16 @@
 		data = ''.join(data)
 		# process response
 		# sys.stdout.write(data)
-		if not data.startswith('Status: 200 OK'):
-			status = data.split('\n', 1)[0]
+		try:
+			if not data.startswith('Status: '):
+				raise ValueError
+			else:
+				status = data.split('\n', 1)[0]
+				code = int(status.split()[1])
+		except:
+			status = 'no status'
+			code = 0
+		if code not in (200,): # accepted status codes
 			status = dicts[i]['environ']['PATH_INFO'] + ' ' + status
 			raise Exception, status
 		if delay:
@@ -103,7 +111,11 @@
 	minParallelRequests=1, maxParallelRequests=1, delay=0.0, slowconn=0):
 	"""Execute stress test on the AppServer according to the arguments."""
 	# taken from CGIAdapter:
-	host, port = open('../address.text').read().split(':')
+	try:
+		host, port = open('../address.text').read().split(':')
+	except:
+		print "Please start the application server first."
+		return
 	if os.name == 'nt' and host == '':
 		# MS Windows doesn't like a blank host name
 		host = 'localhost'

Author: chrisz
Date: Sun Mar 18 05:29:05 2007
New Revision: 6332

Added:
   Webware/trunk/WebKit/Testing/ShowTime.rr
      - copied, changed from r6328, /Webware/trunk/WebKit/Testing/Time.rr
Removed:
   Webware/trunk/WebKit/Testing/Time.rr
Modified:
   Webware/trunk/WebKit/Testing/CountVisits.rr
   Webware/trunk/WebKit/Testing/ListBox.rr
   Webware/trunk/WebKit/Testing/Welcome.rr
   Webware/trunk/WebKit/Testing/stress.py

Log:
Cleanup and minor improvements in stress test.

Modified: Webware/trunk/WebKit/Testing/CountVisits.rr
==============================================================================
--- Webware/trunk/WebKit/Testing/CountVisits.rr	(original)
+++ Webware/trunk/WebKit/Testing/CountVisits.rr	Sun Mar 18 05:29:05 2007
@@ -1 +1 @@
-{'format': 'CGI', 'time': 958871602.895, 'environ': {'DOCUMENT_ROOT': '/home/httpd/html', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': '/home/httpd/html/CountVisits', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Apache/1.3.9  (NetRevolution Advanced Extranet Server/Linux-Mandrake) PHP/3.0.13 mod_perl/1.21 mod_fastcgi/2.2.4', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'REMOTE_PORT': '1045', 'SERVER_NAME': 'localhost.localdomain', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla/4.7 [en] (X11; I; Linux 2.2.14-15mdk i686)', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1,*,utf-8', 'HTTP_ACCEPT': 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*', 'REQUEST_URI': '/~echuck/Projects/Webware/WebKit/WebKit.cgi/CountVisits', 'PATH': '/usr/local/bin:/usr/bin:/bin', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/CountVisits', 'HTTP_HOST': 'localhost.localdomain', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '/~echuck/Projects/Webware/WebKit/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '/home/echuck/public_html/Projects/Webware/WebKit/WebKit.cgi', 'HTTP_COOKIE': '_SID_=2000052021124570402', 'HTTP_REFERER': 'http://localhost.localdomain/~echuck/Projects/Webware/WebKit/WebKit.cgi/Time'}}
+{'format': 'CGI', 'time': 0, 'environ': {'DOCUMENT_ROOT': '.', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': 'CountVisits', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Webware', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'SERVER_NAME': 'localhost', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1', 'HTTP_ACCEPT': '*/*', 'REQUEST_URI': '../Adapters/WebKit.cgi/CountVisits', 'PATH': '', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/CountVisits', 'HTTP_HOST': 'localhost', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '../Adapters/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '../Adapters/WebKit.cgi'}}

Modified: Webware/trunk/WebKit/Testing/ListBox.rr
==============================================================================
--- Webware/trunk/WebKit/Testing/ListBox.rr	(original)
+++ Webware/trunk/WebKit/Testing/ListBox.rr	Sun Mar 18 05:29:05 2007
@@ -1 +1 @@
-{'format': 'CGI', 'time': 958871613.809, 'environ': {'DOCUMENT_ROOT': '/home/httpd/html', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': '/home/httpd/html/ListBox', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Apache/1.3.9  (NetRevolution Advanced Extranet Server/Linux-Mandrake) PHP/3.0.13 mod_perl/1.21 mod_fastcgi/2.2.4', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'REMOTE_PORT': '1055', 'SERVER_NAME': 'localhost.localdomain', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla/4.7 [en] (X11; I; Linux 2.2.14-15mdk i686)', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1,*,utf-8', 'HTTP_ACCEPT': 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*', 'REQUEST_URI': '/~echuck/Projects/Webware/WebKit/WebKit.cgi/ListBox', 'PATH': '/usr/local/bin:/usr/bin:/bin', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/ListBox', 'HTTP_HOST': 'localhost.localdomain', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '/~echuck/Projects/Webware/WebKit/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '/home/echuck/public_html/Projects/Webware/WebKit/WebKit.cgi', 'HTTP_COOKIE': '_SID_=2000052021124570402', 'HTTP_REFERER': 'http://localhost.localdomain/~echuck/Projects/Webware/WebKit/WebKit.cgi/View'}}
+{'format': 'CGI', 'time': 0, 'environ': {'DOCUMENT_ROOT': '.', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': 'ListBox', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Webware', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'SERVER_NAME': 'localhost', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1', 'HTTP_ACCEPT': '*/*', 'REQUEST_URI': '../Adapters/ListBox', 'PATH': '', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/ListBox', 'HTTP_HOST': 'localhost', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '../Adapters/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '../Adapters/WebKit.cgi'}}

Copied: Webware/trunk/WebKit/Testing/ShowTime.rr (from r6328, /Webware/trunk/WebKit/Testing/Time.rr)
==============================================================================
--- /Webware/trunk/WebKit/Testing/Time.rr	(original)
+++ Webware/trunk/WebKit/Testing/ShowTime.rr	Sun Mar 18 05:29:05 2007
@@ -1 +1 @@
-{'format': 'CGI', 'time': 958871601.529, 'environ': {'DOCUMENT_ROOT': '/home/httpd/html', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': '/home/httpd/html/Time', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Apache/1.3.9  (NetRevolution Advanced Extranet Server/Linux-Mandrake) PHP/3.0.13 mod_perl/1.21 mod_fastcgi/2.2.4', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'REMOTE_PORT': '1043', 'SERVER_NAME': 'localhost.localdomain', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla/4.7 [en] (X11; I; Linux 2.2.14-15mdk i686)', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1,*,utf-8', 'HTTP_ACCEPT': 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*', 'REQUEST_URI': '/~echuck/Projects/Webware/WebKit/WebKit.cgi/Time', 'PATH': '/usr/local/bin:/usr/bin:/bin', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/Time', 'HTTP_HOST': 'localhost.localdomain', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '/~echuck/Projects/Webware/WebKit/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '/home/echuck/public_html/Projects/Webware/WebKit/WebKit.cgi', 'HTTP_COOKIE': '_SID_=2000052021124570402', 'HTTP_REFERER': 'http://localhost.localdomain/~echuck/Projects/Webware/WebKit/WebKit.cgi/Welcome'}}
+{'format': 'CGI', 'time': 0, 'environ': {'DOCUMENT_ROOT': '.', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': 'ShowTime', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Webware', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'SERVER_NAME': 'localhost', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1', 'HTTP_ACCEPT': '*/*', 'REQUEST_URI': '../Adapters/WebKit.cgi/ShowTime', 'PATH': '', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/ShowTime', 'HTTP_HOST': 'localhost', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '../Adapters/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '../Adapters/WebKit.cgi'}}

Modified: Webware/trunk/WebKit/Testing/Welcome.rr
==============================================================================
--- Webware/trunk/WebKit/Testing/Welcome.rr	(original)
+++ Webware/trunk/WebKit/Testing/Welcome.rr	Sun Mar 18 05:29:05 2007
@@ -1 +1 @@
-{'format': 'CGI', 'time': 958871565.572, 'environ': {'DOCUMENT_ROOT': '/home/httpd/html', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': '/home/httpd/html/Welcome', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Apache/1.3.9  (NetRevolution Advanced Extranet Server/Linux-Mandrake) PHP/3.0.13 mod_perl/1.21 mod_fastcgi/2.2.4', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'REMOTE_PORT': '1041', 'SERVER_NAME': 'localhost.localdomain', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla/4.7 [en] (X11; I; Linux 2.2.14-15mdk i686)', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1,*,utf-8', 'HTTP_ACCEPT': 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*', 'REQUEST_URI': '/~echuck/Projects/Webware/WebKit/WebKit.cgi/Welcome', 'PATH': '/usr/local/bin:/usr/bin:/bin', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/Welcome', 'HTTP_HOST': 'localhost.localdomain', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '/~echuck/Projects/Webware/WebKit/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '/home/echuck/public_html/Projects/Webware/WebKit/WebKit.cgi', 'HTTP_REFERER': 'http://localhost.localdomain/~echuck/', 'HTTP_PRAGMA': 'no-cache'}}
+{'format': 'CGI', 'time': 0, 'environ': {'DOCUMENT_ROOT': '.', 'SERVER_ADDR': '127.0.0.1', 'HTTP_ACCEPT_ENCODING': 'gzip', 'SERVER_PORT': '80', 'PATH_TRANSLATED': 'Welcome', 'REMOTE_ADDR': '127.0.0.1', 'SERVER_SOFTWARE': 'Webware', 'GATEWAY_INTERFACE': 'CGI/1.1', 'HTTP_ACCEPT_LANGUAGE': 'en', 'SERVER_NAME': 'localhost', 'HTTP_CONNECTION': 'Keep-Alive', 'HTTP_USER_AGENT': 'Mozilla', 'HTTP_ACCEPT_CHARSET': 'iso-8859-1', 'HTTP_ACCEPT': '*/*', 'REQUEST_URI': '../Adapters/WebKit.cgi/Welcome', 'PATH': '', 'QUERY_STRING': '', 'SERVER_PROTOCOL': 'HTTP/1.0', 'PATH_INFO': '/Welcome', 'HTTP_HOST': 'localhost', 'REQUEST_METHOD': 'GET', 'SCRIPT_NAME': '../Adapters/WebKit.cgi', 'SERVER_ADMIN': 'root@...', 'SCRIPT_FILENAME': '../Adapters/WebKit.cgi', 'HTTP_PRAGMA': 'no-cache'}}

Modified: Webware/trunk/WebKit/Testing/stress.py
==============================================================================
--- Webware/trunk/WebKit/Testing/stress.py	(original)
+++ Webware/trunk/WebKit/Testing/stress.py	Sun Mar 18 05:29:05 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-"""
-stress.py
+"""stress.py
+
 By Chuck Esterbrook
 Mods by Jay Love
 
@@ -9,13 +9,13 @@
 	* Test concurrency
 	* Investigate performance
 
-This stress test skips the web server and the WebKit adaptor, so it's not
+This stress test skips the web server and the WebKit adapter, so it's not
 useful for measuring absolute performance. However, after making a
 modification to WebKit or your web-based application, it can be useful to
 see the relative difference in performance (although still somewhat
 unrealistic).
 
-To Run:
+To run:
 	> stress.py  -OR-
 	> python stress.py
 
@@ -31,14 +31,13 @@
 
 Caveat: HTTP cookies are blown away from the raw requests. Mostly due to
 the fact that they will contain stale session ids.
+
 """
 
 
-import sys, os, time
+import sys, os, time, socket
 from glob import glob
-from socket import *
 from marshal import dumps
-from thread import start_new_thread
 from random import randint
 from time import asctime, localtime, time, sleep
 from threading import Thread
@@ -60,17 +59,19 @@
 
 
 def request(names, dicts, host, port, count, delay=0, slowconn=0):
-	"""
-	Performs a single AppServer request including sending the request and receiving the response.
+	"""Perform a single AppServer request.
+
+	This includes sending the request and receiving the response.
 	slowconn simulates a slowed connection from the client.
+
 	"""
 	complete = 0
 	filecount = len(names)
 	totalbytes = 0
 	while complete < count:
 		i = randint(0, filecount-1)
-		# Taken from CGIAdaptor:
-		s = socket(AF_INET, SOCK_STREAM)
+		# taken from CGIAdapter:
+		s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		s.connect((host, port))
 		data = dumps(dicts[i])
 		s.send(dumps(len(data)))
@@ -78,87 +79,89 @@
 		if delay and slowconn:
 			sleep(delay)
 		s.shutdown(1)
-		data = ''
+		data = []
 		while 1:
 			newdata = s.recv(8192)
 			if not newdata:
 				break
 			else:
-				data = data+newdata
-			#sys.stdout.write(data)
-		# END
-		if data.count('Session Expired'):
-			raise Exception, 'Session expired.'
+				data.append(newdata)
+		data = ''.join(data)
+		# process response
+		# sys.stdout.write(data)
+		if not data.startswith('Status: 200 OK'):
+			status = data.split('\n', 1)[0]
+			status = dicts[i]['environ']['PATH_INFO'] + ' ' + status
+			raise Exception, status
 		if delay:
 			sleep(delay)
-		complete = complete +1
-		totalbytes = totalbytes+len(data)
+		complete += 1
+		totalbytes += len(data)
 
-def stress(maxRequests, minParallelRequests=1, maxParallelRequests=1, delay=0.0, slowconn=0):
-	""" Executes a stress test on the AppServer according to the arguments. """
 
-	# Taken from CGIAdaptor:
-	(host, port) = open('../address.text').read().split(':')
-	if os.name == 'nt' and host == '': # MS Windows doesn't like a blank host name
+def stress(maxRequests,
+	minParallelRequests=1, maxParallelRequests=1, delay=0.0, slowconn=0):
+	"""Execute stress test on the AppServer according to the arguments."""
+	# taken from CGIAdapter:
+	host, port = open('../address.text').read().split(':')
+	if os.name == 'nt' and host == '':
+		# MS Windows doesn't like a blank host name
 		host = 'localhost'
 	port = int(port)
 	bufsize = 32*1024
-	# END
-
-	# Get the requests from .rr files which are expected to contain raw request dictionaries
+	# get the requests from .rr files
+	# which are expected to contain raw request dictionaries
 	requestFilenames = glob('*.rr')
-	requestDicts = map(lambda filename: eval(open(filename).read()), requestFilenames)
-	# Kill the HTTP cookies, which typically have an invalid session id
-	# from when the raw requests were captured.
+	requestDicts = map(lambda filename:
+		eval(open(filename).read()), requestFilenames)
+	# kill the HTTP cookies (which typically have an invalid session id)
+	# from when the raw requests were captured
 	for dict in requestDicts:
 		environ = dict['environ']
 		if environ.has_key('HTTP_COOKIE'):
 			del environ['HTTP_COOKIE']
 	requestCount = len(requestFilenames)
-	count = 0
-
-	if maxParallelRequests<minParallelRequests:
+	if maxParallelRequests < minParallelRequests:
 		maxParallelRequests = minParallelRequests
-	sequential = minParallelRequests==1 and maxParallelRequests==1
-
+	sequential = minParallelRequests == 1 and maxParallelRequests == 1
 	startTime = time()
 	count = 0
 	print 'STRESS TEST for Webware.WebKit.AppServer'
 	print
-	print 'time                =', asctime(localtime(time()))
+	print 'time                =', asctime(localtime(startTime))
 	print 'requestFilenames    =', requestFilenames
 	print 'maxRequests         =', maxRequests
 	print 'minParallelRequests =', minParallelRequests
 	print 'maxParallelRequests =', maxParallelRequests
-	print 'delay               = %0.02f' % delay
+	print 'delay               = %g' % delay
 	print 'sequential          =', sequential
 	print 'Running...'
-
-
 	threads = []
 	for i in range(maxParallelRequests):
 		num = randint(minParallelRequests, maxParallelRequests)
 		num = maxRequests/num
-		thread = Thread(target=request, args=(requestFilenames, requestDicts, host, port, num, delay, slowconn))
+		thread = Thread(target=request, args=(
+			requestFilenames, requestDicts, host, port, num, delay, slowconn))
 		thread.start()
 		threads.append(thread)
-		count = count + num
-	# Wait till all threads are finished
+		count += num
+	# wait till all threads are finished
 	for thread in threads:
 		thread.join()
 	threads = None
-	duration = time()-startTime
+	duration = time() - startTime
 	print 'count                = %d' % count
-	print 'duration             = %0.2f' % duration
-	print 'secs/page            = %0.2f' % (duration/count)
-	print 'pages/sec            = %0.2f' % (count/duration)
+	print 'duration             = %g' % duration
+	print 'secs/page            = %g' % (duration/count)
+	if duration:
+		print 'pages/sec            = %g' % (count/duration)
 	print 'Done.'
 	print
 
 
 if __name__=='__main__':
-	if len(sys.argv)==1:
+	if len(sys.argv) == 1:
 		usage()
 	else:
-		args = map(lambda arg: eval(arg), sys.argv[1:])
-		apply(stress, args)
+		args = map(eval, sys.argv[1:])
+		stress(*args)

Author: chrisz
Date: Sat Mar 17 06:22:40 2007
New Revision: 6329

Modified:
   Webware/trunk/WebKit/Application.py
   Webware/trunk/WebKit/Configs/Application.config

Log:
Added SessionName and SessionPrefix to the default Application.config.

Modified: Webware/trunk/WebKit/Application.py
==============================================================================
--- Webware/trunk/WebKit/Application.py	(original)
+++ Webware/trunk/WebKit/Application.py	Sat Mar 17 06:22:40 2007
@@ -87,14 +87,15 @@
 		# sessions, in case the loading of the sessions causes an exception.
 		self._exceptionHandlerClass = ExceptionHandler
 
-		self._session_prefix = self.setting('SessionPrefix', None) or ''
+		self._session_prefix = self.setting('SessionPrefix') or ''
 		if self._session_prefix:
 			if self._session_prefix == 'hostname':
 				from MiscUtils.Funcs import hostName
 				self._session_prefix = hostName()
 			self._session_prefix += '-'
 		self._session_timeout = self.setting('SessionTimeout')*60
-		self._session_name = self.setting('SessionName', None) or '_SID_'
+		self._session_name = self.setting('SessionName') \
+			or self.defaultConfig()['SessionName']
 
 		# For session store:
 		session_store = 'Session%sStore' % self.setting('SessionStore')
@@ -213,6 +214,8 @@
 				],
 			'SessionStore': 'Dynamic',
 			'SessionTimeout': 60,
+			'SessionPrefix': '',
+			'SessionName': '_SID_',
 			'IgnoreInvalidSession': 1,
 			'UseAutomaticPathSessions': 0,
 			'ShowDebugInfoOnErrors': 1,

Modified: Webware/trunk/WebKit/Configs/Application.config
==============================================================================
--- Webware/trunk/WebKit/Configs/Application.config	(original)
+++ Webware/trunk/WebKit/Configs/Application.config	Sat Mar 17 06:22:40 2007
@@ -41,6 +41,8 @@
 
 SessionStore = 'Dynamic' # can be File or Dynamic or Memory
 SessionTimeout = 60 # minutes
+SessionPrefix = None # no prefix for session IDs
+SessionName = '_SID_' # name of the field holding the session ID
 # Maximum number of sessions in memory:
 MaxDynamicMemorySessions = 10000
 # Time in minutes when to move sessions from memory to disk:

Author: chrisz
Date: Sat Mar 17 05:47:40 2007
New Revision: 6328

Modified:
   Webware/trunk/WebKit/Cookie.py
   Webware/trunk/WebKit/Monitor.py
   Webware/trunk/WebKit/XMLRPCServlet.py

Log:
Removed unnecessary imports.

Modified: Webware/trunk/WebKit/Cookie.py
==============================================================================
--- Webware/trunk/WebKit/Cookie.py	(original)
+++ Webware/trunk/WebKit/Cookie.py	Sat Mar 17 05:47:40 2007
@@ -5,8 +5,7 @@
 # If this is Python 2.2 or greater, import the standard Cookie module
 # as CookieEngine. Otherwise, import WebUtils.Cookie as CookieEngine.
 # This is because there is a nasty bug in the Cookie.py module
-# included in Python 2.1 and earlier, and Python 1.5.2 doesn't even
-# include Cookie.py at all.
+# included in Python 2.1 and earlier.
 
 pyVer = getattr(sys, 'version_info', None)
 if pyVer and pyVer[:2] >= (2, 2):
@@ -15,7 +14,7 @@
 	# from the path that might cause us to import from the WebKit
 	# directory, then import Cookie using that restricted path --
 	# that ought to ensure that we're using Python's module.
-	import imp, string, sys, os
+	import imp
 	path = []
 	thisDir = os.path.abspath(os.path.dirname(__file__))
 	for dir in sys.path:
@@ -25,7 +24,7 @@
 			continue
 		path.append(dir)
 	try:
-		(file, pathname, description) = imp.find_module('Cookie', path)
+		file, pathname, description = imp.find_module('Cookie', path)
 		CookieEngine = imp.load_module('Cookie', file, pathname, description)
 	except:
 		if file:

Modified: Webware/trunk/WebKit/Monitor.py
==============================================================================
--- Webware/trunk/WebKit/Monitor.py	(original)
+++ Webware/trunk/WebKit/Monitor.py	Sat Mar 17 05:47:40 2007
@@ -55,13 +55,7 @@
 monitorInterval = 10 # add to config if this implementation is adopted
 maxStartTime = 120
 
-import socket
-import time
-import os
-import asyncore
-import sys
-import signal
-import string
+import os, sys, time, socket, signal
 from marshal import dumps
 
 global serverName

Modified: Webware/trunk/WebKit/XMLRPCServlet.py
==============================================================================
--- Webware/trunk/WebKit/XMLRPCServlet.py	(original)
+++ Webware/trunk/WebKit/XMLRPCServlet.py	Sat Mar 17 05:47:40 2007
@@ -11,7 +11,7 @@
 except ImportError:
 	import xmlrpclib
 
-import sys, string, traceback
+import sys, traceback
 
 try: # backward compatibility for Python < 2.3
 	True, False

Author: chrisz
Date: Sat Mar 17 05:30:01 2007
New Revision: 6327

Modified:
   Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
   Webware/trunk/WebKit/AppServer.py
   Webware/trunk/WebKit/Common.py
   Webware/trunk/WebKit/Examples/ShowTime.py
   Webware/trunk/WebKit/ExceptionHandler.py
   Webware/trunk/WebKit/Request.py
   Webware/trunk/WebKit/ThreadedAppServer.py

Log:
Use time provided by Common module where possible.

Modified: Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
==============================================================================
--- Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py	(original)
+++ Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py	Sat Mar 17 05:30:01 2007
@@ -145,7 +145,7 @@
 		startTime = time.time()
 		if verbose:
 			print 'BEGIN REQUEST'
-			print time.asctime(time.localtime(startTime))
+			print asclocaltime(startTime)
 		conn = self._sock
 		if verbose:
 			print 'receiving request from', conn
@@ -279,7 +279,7 @@
 
 def shutDown(arg1,arg2):
 	global server
-	print "Shutdown Called", time.asctime(time.localtime(time.time()))
+	print "Shutdown Called", asclocaltime()
 	if server:
 		server.initiateShutdown()
 	else:

Modified: Webware/trunk/WebKit/AppServer.py
==============================================================================
--- Webware/trunk/WebKit/AppServer.py	(original)
+++ Webware/trunk/WebKit/AppServer.py	Sat Mar 17 05:30:01 2007
@@ -246,7 +246,7 @@
 		print 'Please visit: http://www.webwareforpython.org'
 		print
 		print 'Process id is', os.getpid()
-		print 'Date/time is', time.asctime(time.localtime(time.time()))
+		print 'Date/time is', asclocaltime()
 		print 'Python is', sys.version.replace(') [', ')\n[')
 		print
 		if self.setting('PrintConfigAtStartUp'):

Modified: Webware/trunk/WebKit/Common.py
==============================================================================
--- Webware/trunk/WebKit/Common.py	(original)
+++ Webware/trunk/WebKit/Common.py	Sat Mar 17 05:30:01 2007
@@ -48,9 +48,11 @@
 
 # @@ 2000-05-10 ce: Consider if all the following should be located in MiscUtils
 
-def asclocaltime():
-	""" Returns a readable string of the current, local time. Useful for time stamps in log files. """
-	return time.asctime(time.localtime(time.time()))
+def asclocaltime(t = None):
+	"""Return a readable string of the current, local time. Useful for time stamps in log files."""
+	if t is None:
+		t = time.time()
+	return time.asctime(time.localtime(t))
 
 
 # @@ 2002-11-10 ce: Tombstone is now deprecated (post 0.7)

Modified: Webware/trunk/WebKit/Examples/ShowTime.py
==============================================================================
--- Webware/trunk/WebKit/Examples/ShowTime.py	(original)
+++ Webware/trunk/WebKit/Examples/ShowTime.py	Sat Mar 17 05:30:01 2007
@@ -1,10 +1,9 @@
-from time import *
-
 from ExamplePage import ExamplePage
+from WebKit.Common import asclocaltime
 
 
 class ShowTime(ExamplePage):
 
 	def writeContent(self):
 		self.write('<h4>The current time is:</h4>')
-		self.write('<h5 style="color:green">', asctime(localtime(time())), '</h5>')
+		self.write('<h5 style="color:green">', asclocaltime(), '</h5>')

Modified: Webware/trunk/WebKit/ExceptionHandler.py
==============================================================================
--- Webware/trunk/WebKit/ExceptionHandler.py	(original)
+++ Webware/trunk/WebKit/ExceptionHandler.py	Sat Mar 17 05:30:01 2007
@@ -1,6 +1,5 @@
 from types import DictType, ListType, StringType
 import traceback, random, MimeWriter, smtplib, StringIO
-from time import asctime, localtime
 
 from Common import *
 from MiscUtils.Funcs import dateForEmail
@@ -218,7 +217,7 @@
 		if stderr is None:
 			stderr = sys.stderr
 		stderr.write('[%s] [error] WebKit: Error while executing script %s\n'
-			% (asctime(localtime(self._time)), self.servletPathname()))
+			% (asclocaltime(self._time), self.servletPathname()))
 		traceback.print_exc(file=stderr)
 
 	def publicErrorPage(self):
@@ -397,7 +396,7 @@
 		"""
 		self.writeTitle('MiscInfo')
 		info = {
-			'time':        asctime(localtime(self._time)),
+			'time':        asclocaltime(self._time),
 			'filename':    self.servletPathname(),
 			'os.getcwd()': os.getcwd(),
 			'sys.path':    sys.path,
@@ -478,7 +477,7 @@
 
 		"""
 		return 'Error-%s-%s-%d.html' % (self.basicServletName(),
-			'-'.join(map(lambda x: '%02d' % x, localtime(self._time)[:6])),
+			'-'.join(map(lambda x: '%02d' % x, time.localtime(self._time)[:6])),
 				random.randint(10000, 99999))
 			# @@ 2000-04-21 ce: Using the timestamp & a
 			# random number is a poor technique for
@@ -496,7 +495,7 @@
 		if not self.setting('LogErrors'):
 			return
 		logline = (
-			asctime(localtime(self._time)),
+			asclocaltime(self._time),
 			self.basicServletName(),
 			self.servletPathname(),
 			str(self._exc[0]),
@@ -551,7 +550,7 @@
 				'WebKit caught an exception while processing ' +
 				'a request for "%s" ' % self.servletPathname() +
 				'at %s (timestamp: %s).  ' %
-				(asctime(localtime(self._time)), self._time) +
+				(asclocaltime(self._time), self._time) +
 				'The plain text traceback from Python is printed below and ' +
 				'the full HTML error report from WebKit is attached.\n\n'
 				)

Modified: Webware/trunk/WebKit/Request.py
==============================================================================
--- Webware/trunk/WebKit/Request.py	(original)
+++ Webware/trunk/WebKit/Request.py	Sat Mar 17 05:30:01 2007
@@ -1,5 +1,3 @@
-from time import asctime, localtime
-
 from Common import *
 from Message import Message
 
@@ -39,7 +37,7 @@
 
 	def timeStamp(self):
 		"""Return time() as a human readable string, useful for logging and debugging."""
-		return asctime(localtime(self.time()))
+		return asclocaltime(self.time())
 
 
 	## Input ##

Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py	(original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py	Sat Mar 17 05:30:01 2007
@@ -702,7 +702,7 @@
 		startTime = time.time()
 		if verbose:
 			print "BEGIN REQUEST"
-			print time.asctime(time.localtime(startTime))
+			print asclocaltime(startTime)
 		conn = self._sock
 		if verbose:
 			print "receiving request from", conn
@@ -961,7 +961,7 @@
 	print
 	print "App server has been signaled to shutdown."
 	if server and server.running > 2:
-		print "Shutting down at", time.asctime(time.localtime(time.time()))
+		print "Shutting down at", asclocaltime()
 		sys.stdout.flush()
 		server.running = 2
 		if signum == SIGINT:
@@ -983,7 +983,7 @@
 		print
 		print "App server has been signaled to attempt a thread dump."
 		print
-		print "Thread stack frame dump at", time.asctime(time.localtime(time.time()))
+		print "Thread stack frame dump at", asclocaltime()
 		sys.stdout.flush()
 		frames = threadframe.dict()
 		items = frames.items()