Webware for Python

Update of /cvsroot/webware/Webware/MiddleKit
In directory usw-pr-cvs1:/tmp/cvs-serv10573

Modified Files:
	__init__.py 
Log Message:
fix problem wrt using app.serverSidePath() and MakeAppWorkDir when locating the MK WebBrowser context

Index: __init__.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/__init__.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** __init__.py	2001/10/26 21:31:36	1.10
--- __init__.py	2001/10/26 23:22:06	1.11
***************
*** 1,5 ****
  # MiddleKit
  
! __version__ = '0.1'
  
  __all__ = ['Core', 'Design', 'Run']
--- 1,5 ----
  # MiddleKit
  
! __version__ = '0.2'
  
  __all__ = ['Core', 'Design', 'Run']
***************
*** 10,17 ****
  	app = appServer.application()
  	mkPathVia__file__ = os.path.join(os.getcwd(), os.path.dirname(__file__))
! 	mkPathViaApp = app.serverSidePath(os.path.join(os.pardir, 'MiddleKit'))
! 	assert mkPathVia__file__==mkPathViaApp, '\nmkPathVia__file__=%r\nmkPathViaApp=%r\n' % (
! 		mkPathVia__file__, mkPathViaApp)
! 	path = os.path.join(mkPathViaApp, 'WebBrowser')
  	if os.path.exists(path):
  		app.addContext('MKBrowser', path)
--- 10,17 ----
  	app = appServer.application()
  	mkPathVia__file__ = os.path.join(os.getcwd(), os.path.dirname(__file__))
! 	#mkPathViaApp = app.serverSidePath(os.path.join(os.pardir, 'MiddleKit'))
! 	#assert mkPathVia__file__==mkPathViaApp, '\nmkPathVia__file__=%r\nmkPathViaApp=%r\n' % (
! 	#	mkPathVia__file__, mkPathViaApp)
! 	path = os.path.join(mkPathVia__file__, 'WebBrowser')
  	if os.path.exists(path):
  		app.addContext('MKBrowser', path)

Update of /cvsroot/webware/Webware/MiddleKit/WebBrowser
In directory usw-pr-cvs1:/tmp/cvs-serv10243

Modified Files:
	SelectDatabase.py SelectModel.py SitePage.py 
Log Message:
makes use of MiscUtils.Funcs.hostName

Index: SelectDatabase.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/WebBrowser/SelectDatabase.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectDatabase.py	2001/10/08 17:15:44	1.2
--- SelectDatabase.py	2001/10/26 23:20:44	1.3
***************
*** 1,4 ****
--- 1,5 ----
  from SitePage import SitePage
  from MiscUtils.DataTable import DataTable
+ from MiscUtils.Funcs import hostName as HostName
  
  
***************
*** 49,53 ****
  		self.writeHeading('Select a known database:')
  		knownDBs = self.setting('KnownDatabases')
! 		hostName = self.hostName()
  		if not hostName:
  			hostName = '_default_'
--- 50,54 ----
  		self.writeHeading('Select a known database:')
  		knownDBs = self.setting('KnownDatabases')
! 		hostName = HostName()
  		if not hostName:
  			hostName = '_default_'

Index: SelectModel.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/WebBrowser/SelectModel.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectModel.py	2001/02/24 06:43:07	1.2
--- SelectModel.py	2001/10/26 23:20:44	1.3
***************
*** 1,4 ****
--- 1,5 ----
  from SitePage import SitePage
  import os
+ from MiscUtils.Funcs import hostName as HostName
  
  
***************
*** 47,51 ****
  		self.writeHeading('Select a known model:')
  		knownModels = self.setting('KnownModels')
! 		hostName = self.hostName()
  		if not hostName:
  			hostName = '_default_'
--- 48,52 ----
  		self.writeHeading('Select a known model:')
  		knownModels = self.setting('KnownModels')
! 		hostName = HostName()
  		if not hostName:
  			hostName = '_default_'

Index: SitePage.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/WebBrowser/SitePage.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SitePage.py	2001/04/17 11:56:02	1.3
--- SitePage.py	2001/10/26 23:20:44	1.4
***************
*** 84,89 ****
  		for name, value in self.request().fields().items():
  			res.setCookie(name, value)
- 
- 	def hostName(self):
- 		''' Returns the name of the host, using the external command 'hostname' found on most flavors of UNIX and recent flavors of Windows. We can't rely on os.environ because in a web environment it might not be passed. We can't rely on the CGI standard HTTP_HOST, because it often returns 127.0.0.1, when it's the name that we want. '''
- 		return os.popen('hostname').read().strip()
--- 84,85 ----

Update of /cvsroot/webware/Webware/MiddleKit
In directory usw-pr-cvs1:/tmp/cvs-serv13677

Modified Files:
	__init__.py 
Log Message:
renamed a misnamed variable

Index: __init__.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/__init__.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** __init__.py	2001/10/25 07:26:23	1.9
--- __init__.py	2001/10/26 21:31:36	1.10
***************
*** 10,17 ****
  	app = appServer.application()
  	mkPathVia__file__ = os.path.join(os.getcwd(), os.path.dirname(__file__))
! 	mkPathViaAppServer = app.serverSidePath(os.path.join(os.pardir, 'MiddleKit'))
! 	assert mkPathVia__file__==mkPathViaAppServer, '\nmkPathVia__file__=%r\nmkPathViaAppServer=%r\n' % (
! 		mkPathVia__file__, mkPathViaAppServer)
! 	path = os.path.join(mkPathViaAppServer, 'WebBrowser')
  	if os.path.exists(path):
  		app.addContext('MKBrowser', path)
--- 10,17 ----
  	app = appServer.application()
  	mkPathVia__file__ = os.path.join(os.getcwd(), os.path.dirname(__file__))
! 	mkPathViaApp = app.serverSidePath(os.path.join(os.pardir, 'MiddleKit'))
! 	assert mkPathVia__file__==mkPathViaApp, '\nmkPathVia__file__=%r\nmkPathViaApp=%r\n' % (
! 		mkPathVia__file__, mkPathViaApp)
! 	path = os.path.join(mkPathViaApp, 'WebBrowser')
  	if os.path.exists(path):
  		app.addContext('MKBrowser', path)

Update of /cvsroot/webware/Webware/PSP/Examples
In directory usw-pr-cvs1:/tmp/cvs-serv16586

Modified Files:
	PSPTests-Braces.psp PSPTests.psp 
Removed Files:
	TrackingExample.psp 
Log Message:
extraction of Cans

Index: PSPTests-Braces.psp
===================================================================
RCS file: /cvsroot/webware/Webware/PSP/Examples/PSPTests-Braces.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PSPTests-Braces.psp	2001/08/05 23:37:36	1.8
--- PSPTests-Braces.psp	2001/10/26 14:07:06	1.9
***************
*** 69,78 ****
  <% for i in range(2): {        # Loop #1
  	self.write('<p>outerloop: ')
! 	self.write(i) %> 
  	<% for n in range(2):{ %>  <%-- Another loop --%>
  		<p><i> &nbsp;&nbsp;Inner Loop: <%= n %><br> </i>
! 		<%self.write('Still in the inner loop') 
  	 }   # End loop #1
!  } 
  %>  <%-- End loop #2 --%>
  
--- 69,78 ----
  <% for i in range(2): {        # Loop #1
  	self.write('<p>outerloop: ')
! 	self.write(i) %>
  	<% for n in range(2):{ %>  <%-- Another loop --%>
  		<p><i> &nbsp;&nbsp;Inner Loop: <%= n %><br> </i>
! 		<%self.write('Still in the inner loop')
  	 }   # End loop #1
!  }
  %>  <%-- End loop #2 --%>
  
***************
*** 82,86 ****
  <b>Unix system info.</b>
  <table bgcolor = 'blue'>
! <% 
  if os.name == 'posix': {
  	for i in os.uname():{
--- 82,86 ----
  <b>Unix system info.</b>
  <table bgcolor = 'blue'>
! <%
  if os.name == 'posix': {
  	for i in os.uname():{
***************
*** 137,154 ****
  <%-- "pass" can be used to end a block, so test that it can be used by itself too! --%>
  <% pass %>
- 
- 
- <%-- Here is a crappy Can example.  I've got a whole site built around this now, so I should improve this example %--%>
- <p>Here is a list of the pages you have been to that are tracking compatible:<br>
- 
- <% locationCan = self.getCan("locationCan","WebKit.Cans.LocationCan","session")%>
- 
- <%locationCan.addLocation(req.pathInfo())
- for i in locationCan.locationList(): {  %>
- <p><b><%= i %></b>
- <% } %>
- 
- <p>There's actually only one other page that is tracking compatible, <a href="TrackingExample.psp"> this one </a>
- <p><p><p>
  
  </td><td></td></tr></table>
--- 137,140 ----

Index: PSPTests.psp
===================================================================
RCS file: /cvsroot/webware/Webware/PSP/Examples/PSPTests.psp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PSPTests.psp	2001/08/05 23:37:36	1.22
--- PSPTests.psp	2001/10/26 14:07:06	1.23
***************
*** 143,159 ****
  
  
- <%-- Here is a crappy Can example.  I've got a whole site built around this now, so I should improve this example %--%>
- <p>Here is a list of the pages you have been to that are tracking compatible:<br>
- 
- <% locationCan = self.getCan("locationCan","WebKit.Cans.LocationCan","session")%>
- 
- <%locationCan.addLocation(req.pathInfo())
- for i in locationCan.locationList():%>
- <p><b><%= i %></b>
- <% end %>
- 
- <p>There's actually only one other page that is tracking compatible, <a href="TrackingExample.psp"> this one </a>
- <p><p><p>
- 
  </td><td></td></tr></table>
  
--- 143,146 ----

--- TrackingExample.psp DELETED ---

Update of /cvsroot/webware/Webware/WebKit/Configs
In directory usw-pr-cvs1:/tmp/cvs-serv10599

Modified Files:
	AppServer.config 
Log Message:
set Verbose back to 1 like it used to be

Index: AppServer.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/AppServer.config,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AppServer.config	2001/06/27 23:05:24	1.12
--- AppServer.config	2001/10/26 13:54:55	1.13
***************
*** 1,5 ****
  {
  	'PrintConfigAtStartUp': 1,
! 	'Verbose':              0,
  	'Host':                 '127.0.0.1',
  	'Port':                 8086,
--- 1,5 ----
  {
  	'PrintConfigAtStartUp': 1,
! 	'Verbose':              1,
  	'Host':                 '127.0.0.1',
  	'Port':                 8086,

Update of /cvsroot/webware/Webware/WebUtils
In directory usw-pr-cvs1:/tmp/cvs-serv3020/WebUtils

Modified Files:
	Properties.py 
Log Message:
updated version numbers

Index: Properties.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebUtils/Properties.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Properties.py	2001/02/25 17:43:25	1.2
--- Properties.py	2001/10/26 13:42:38	1.3
***************
*** 1,5 ****
  name = 'WebUtils'
  
! version = (0, 2, 1)
  
  docs = [
--- 1,5 ----
  name = 'WebUtils'
  
! version = (0, 3, 0)
  
  docs = [

Update of /cvsroot/webware/Webware/UserKit
In directory usw-pr-cvs1:/tmp/cvs-serv3020/UserKit

Modified Files:
	Properties.py 
Log Message:
updated version numbers

Index: Properties.py
===================================================================
RCS file: /cvsroot/webware/Webware/UserKit/Properties.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Properties.py	2001/02/25 17:43:25	1.3
--- Properties.py	2001/10/26 13:42:38	1.4
***************
*** 1,5 ****
  name = 'UserKit'
  
! version = (0, 1, 0)
  
  docs = [
--- 1,5 ----
  name = 'UserKit'
  
! version = (0, 2, 0)
  
  docs = [

Update of /cvsroot/webware/Webware/PSP
In directory usw-pr-cvs1:/tmp/cvs-serv3020/PSP

Modified Files:
	Properties.py 
Log Message:
updated version numbers

Index: Properties.py
===================================================================
RCS file: /cvsroot/webware/Webware/PSP/Properties.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Properties.py	2001/05/07 02:05:12	1.5
--- Properties.py	2001/10/26 13:42:38	1.6
***************
*** 1,5 ****
  name = 'Python Server Pages'
  
! version = (0, 4, 0)
  
  docs = [ {'name': "User's Guide", 'file': 'UsersGuide.html'} ]
--- 1,5 ----
  name = 'Python Server Pages'
  
! version = (0, 5, 0)
  
  docs = [ {'name': "User's Guide", 'file': 'UsersGuide.html'} ]

Update of /cvsroot/webware/Webware/MiscUtils
In directory usw-pr-cvs1:/tmp/cvs-serv3020/MiscUtils

Modified Files:
	Properties.py 
Log Message:
updated version numbers

Index: Properties.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiscUtils/Properties.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Properties.py	2001/02/27 06:18:26	1.4
--- Properties.py	2001/10/26 13:42:38	1.5
***************
*** 1,5 ****
  name = 'MiscUtils'
  
! version = (0, 5, 0)
  
  docs = [
--- 1,5 ----
  name = 'MiscUtils'
  
! version = (0, 6, 0)
  
  docs = [

Update of /cvsroot/webware/Webware/MiddleKit
In directory usw-pr-cvs1:/tmp/cvs-serv3020/MiddleKit

Modified Files:
	Properties.py 
Log Message:
updated version numbers

Index: Properties.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Properties.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Properties.py	2001/02/25 17:43:25	1.4
--- Properties.py	2001/10/26 13:42:38	1.5
***************
*** 1,5 ****
  name = 'MiddleKit'
  
! version = (0, 1, 0)
  
  docs = [
--- 1,5 ----
  name = 'MiddleKit'
  
! version = (0, 2, 0)
  
  docs = [

Update of /cvsroot/webware/Webware/WebKit/Docs
In directory usw-pr-cvs1:/tmp/cvs-serv22285

Modified Files:
	InstallGuide.html 
Log Message:
fixed a directory reference

Index: InstallGuide.html
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Docs/InstallGuide.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InstallGuide.html	2001/10/08 18:09:20	1.16
--- InstallGuide.html	2001/10/26 13:22:25	1.17
***************
*** 367,371 ****
  <p> This adapter is the fastest of the adapters available for WebKit.
  
! <p> The source code and a README file describing how to configure and build mod_webkit are located in the Webware/WebKit/mod_webkit directory.
  
  <a name=Adapters_AOLserver><h3>AOLserver Adapter</h3></a>
--- 367,371 ----
  <p> This adapter is the fastest of the adapters available for WebKit.
  
! <p> The source code and a README file describing how to configure and build mod_webkit are located in the Webware/WebKit/Native/mod_webkit directory.
  
  <a name=Adapters_AOLserver><h3>AOLserver Adapter</h3></a>