Webware for Python

Author: chrisz
Date: Fri Jul 29 09:57:42 2011
New Revision: 8172

Log:
Use cProfile instead of profile whenever possible.

Modified:
   Webware/trunk/MiscUtils/Tests/BenchCSVParser.py
   Webware/trunk/MiscUtils/Tests/BenchDataTable.py
   Webware/trunk/WebKit/AppServerService.py
   Webware/trunk/WebKit/Docs/RelNotes-X.Y.phtml
   Webware/trunk/WebKit/Launch.py
   Webware/trunk/WebKit/Profiler.py

Modified: Webware/trunk/MiscUtils/Tests/BenchCSVParser.py
==============================================================================
--- Webware/trunk/MiscUtils/Tests/BenchCSVParser.py	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/MiscUtils/Tests/BenchCSVParser.py	Fri Jul 29 09:57:42 2011	(r8172)
@@ -3,7 +3,10 @@
 import sys
 import time
 from glob import glob
-from profile import Profile
+try:
+    from cProfile import Profile
+except ImportError:
+    from profile import Profile
 
 import FixPath
 from MiscUtils.CSVParser import CSVParser

Modified: Webware/trunk/MiscUtils/Tests/BenchDataTable.py
==============================================================================
--- Webware/trunk/MiscUtils/Tests/BenchDataTable.py	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/MiscUtils/Tests/BenchDataTable.py	Fri Jul 29 09:57:42 2011	(r8172)
@@ -3,7 +3,10 @@
 import sys
 import time
 from glob import glob
-from profile import Profile
+try:
+    from cProfile import Profile
+except ImportError:
+    from profile import Profile
 
 import FixPath
 from MiscUtils.DataTable import DataTable

Modified: Webware/trunk/WebKit/AppServerService.py
==============================================================================
--- Webware/trunk/WebKit/AppServerService.py	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/WebKit/AppServerService.py	Fri Jul 29 09:57:42 2011	(r8172)
@@ -216,7 +216,10 @@
                 print
                 sys.stdout.flush()
                 if self._runProfile:
-                    from profile import Profile
+                    try:
+                        from cProfile import Profile
+                    except ImportError:
+                        from profile import Profile
                     profiler = Profile()
                     Profiler.profiler = profiler
                     sys.stdout.flush()

Modified: Webware/trunk/WebKit/Docs/RelNotes-X.Y.phtml
==============================================================================
--- Webware/trunk/WebKit/Docs/RelNotes-X.Y.phtml	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/WebKit/Docs/RelNotes-X.Y.phtml	Fri Jul 29 09:57:42 2011	(r8172)
@@ -47,6 +47,10 @@
   but later created the socket connection with IPv4 even if it was an IPv6
   address. Fixed this so that the WKServer address is always interpreted as IPv4.
   The ThreadedAppServer only listens on an IPv4 socket anyway.</li>
+  <li>If the AppServer is launched with <code>runProfile = False</code>
+  (see <span class="filename">Profiler.py</span> for details), then the
+  profiling will be done with the <code>cProfile</code> module instead of
+  the <code>profile</code> module if possible (Python 2.5 and later).</li>
 </ul>
 
 <a name="MinorChanges"></a><h2>Minor API Changes</h2>
@@ -60,8 +64,8 @@
 <ul>
   <li>The mod_webkit2 adapter interpreted the WKServer host address as
   IPv6 in newer Linux versions and then was unable to connect.</li>
-  <li>Thread dumps now work with Python > 2.4 (and the threadframe module
-  isn't necessary here any more).</li>
+  <li>Thread dumps now work with Python 2.5 and later (and the threadframe
+  module isn't necessary here any more).</li>
   <li>For some kinds of bad URLs, the URLParser raised an AssertionError
   instead of HTTPNotFound.</li>
   <li>The modified <code>FieldStorage</code> class used by WebKit did not work

Modified: Webware/trunk/WebKit/Launch.py
==============================================================================
--- Webware/trunk/WebKit/Launch.py	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/WebKit/Launch.py	Fri Jul 29 09:57:42 2011	(r8172)
@@ -421,7 +421,10 @@
             print ('Profiling is on. '
                 'See docstring in Profiler.py for more info.')
             print
-            from profile import Profile
+            try:
+                from cProfile import Profile
+            except ImportError:
+                from profile import Profile
             profiler = Profile()
             Profiler.profiler = profiler
             errorlevel = Profiler.runCall(launchWebKit, *args)

Modified: Webware/trunk/WebKit/Profiler.py
==============================================================================
--- Webware/trunk/WebKit/Profiler.py	Fri Jul 29 08:47:14 2011	(r8171)
+++ Webware/trunk/WebKit/Profiler.py	Fri Jul 29 09:57:42 2011	(r8172)
@@ -12,6 +12,9 @@
     $ cd Webware
     $ bin/printprof.py WebKit/profile.pstats
 
+Using the RunSnakeRun (http://www.vrplumber.com/programming/runsnakerun/)
+GUI utility you can even visualize the data in the profile.pstats file.
+
 You might also wish to dump the profiling stats on demand (as in, by
 clicking or reloading a URL for that purpose). Read further for details.
 
@@ -43,20 +46,22 @@
 
 profiler = startTime = readyTime = readyDuration = None
 
-# Convenience
+
+## Convenience ##
 
 statsFilename = 'profile.pstats'
 
+
 def runCall(func, *args, **kwargs):
     return profiler.runcall(func, *args, **kwargs)
 
+
 def dumpStats(file=statsFilename):
     profiler.dump_stats(file)
 
+
 def reset():
-    """
-    Invoked by DebugAppServer in support of AutoReload.
-    """
+    """Invoked by DebugAppServer in support of AutoReload."""
     global startTime
     import time
     startTime = time.time()

Author: chrisz
Date: Fri Jul 29 08:47:14 2011
New Revision: 8171

Log:
Avoid slash in module name since some Python versions do not like this.

Modified:
   Webware/branches/Branch-1_0/WebKit/ServletFactory.py

Modified: Webware/branches/Branch-1_0/WebKit/ServletFactory.py
==============================================================================
--- Webware/branches/Branch-1_0/WebKit/ServletFactory.py	Fri Jul 29 08:44:09 2011	(r8170)
+++ Webware/branches/Branch-1_0/WebKit/ServletFactory.py	Fri Jul 29 08:47:14 2011	(r8171)
@@ -117,9 +117,10 @@
 		# There is no context, so import the module standalone
 		# and give it a unique name:
 		if not fullname or not path.startswith(contextPath):
-			remainder = serverSidePathToImport
-			fullmodname = remainder.replace(
-				'\\', '_').replace('/', '_').replace('.', '_')
+			fullmodname = serverSidePathToImport
+			if os.sep != '/':
+				fullmodname = fullmodname.replace(os.sep, '_')
+			fullmodname = fullmodname.replace('/', '_').replace('.', '_')
 			if debug:
 				print __file__, ", fullmodname =", fullmodname
 			modname = os.path.splitext(os.path.basename(
@@ -130,14 +131,19 @@
 			module.__donotreload__ = True
 			return module
 
-		# First, we'll import the context's package.
+		# First, we'll import the context's package.#
+		if os.sep != '/':
+			fullname = fullname.replace(os.sep, '_')
+		fullname = fullname.replace('/', '_'
 		directory, contextDirName = os.path.split(contextPath)
 		self._importModuleFromDirectory(fullname, contextDirName,
 			directory, isPackageDir=True)
 		directory = contextPath
 
 		# Now we'll break up the rest of the path into components.
-		remainder = path[len(contextPath)+1:].replace('\\', '/')
+		remainder = path[len(contextPath)+1:]
+		if os.sep != '/':
+			remainder = remainder.replace(os.sep, '/')
 		remainder = remainder.split('/')
 
 		# Import all subpackages of the context package

Author: chrisz
Date: Fri Jul 29 08:44:09 2011
New Revision: 8170

Log:
Removed unnecessary line in last patch.

Modified:
   Webware/trunk/WebKit/ServletFactory.py

Modified: Webware/trunk/WebKit/ServletFactory.py
==============================================================================
--- Webware/trunk/WebKit/ServletFactory.py	Fri Jul 29 05:17:54 2011	(r8169)
+++ Webware/trunk/WebKit/ServletFactory.py	Fri Jul 29 08:44:09 2011	(r8170)
@@ -134,7 +134,6 @@
             return module
 
         # First, we'll import the context's package.
-        fullname = request.contextName()
         if os.sep != '/':
             fullname = fullname.replace(os.sep, '_')
         fullname = fullname.replace('/', '_')

Author: chrisz
Date: Fri Jul 29 05:17:54 2011
New Revision: 8169

Log:
Added remark concerning use of PyPy.

Modified:
   Webware/trunk/Docs/ReleaseProcedures.phtml
   Webware/trunk/WebKit/Docs/InstallGuide.txt

Modified: Webware/trunk/Docs/ReleaseProcedures.phtml
==============================================================================
--- Webware/trunk/Docs/ReleaseProcedures.phtml	Fri Jul 29 05:05:23 2011	(r8168)
+++ Webware/trunk/Docs/ReleaseProcedures.phtml	Fri Jul 29 05:17:54 2011	(r8169)
@@ -61,8 +61,9 @@
     been changes, provide binaries for Windows users and adjust the version
     number in mod_webkit.c to the Webware version.
 
-[ ] Run the above tests on all supported Python versions (currently 2.4-2.7)
-    and different platforms (e.g. various flavors of Linux, MacOS, Windows).
+[ ] Run the above tests on all supported Python versions (currently these are
+    versions 2.4-2.7 and PyPy 1.5) and on different platforms (e.g. various
+    flavors of Linux, MacOS, Windows).
 </pre>
 
 

Modified: Webware/trunk/WebKit/Docs/InstallGuide.txt
==============================================================================
--- Webware/trunk/WebKit/Docs/InstallGuide.txt	Fri Jul 29 05:05:23 2011	(r8168)
+++ Webware/trunk/WebKit/Docs/InstallGuide.txt	Fri Jul 29 05:17:54 2011	(r8169)
@@ -80,7 +80,9 @@
 still use the Webware 1.0 branch.  If you get an error message about
 the version, you're probably unwittingly running the wrong version
 of Python.  Change the ``AppServer`` or ``AppServer.bat`` scripts,
-giving the full path to the correct Python interpreter.
+giving the full path to the correct Python interpreter.  You can also
+try running Webware with PyPy.  The AppServer should work with PyPy 1.5,
+but this has not been thoroughly tested and seems to be less performant.
 
 Your installation of Python must be multi-threaded.  It's not entirely
 uncommon for third party web host providers to leave this disabled in

Author: chrisz
Date: Fri Jul 29 05:05:23 2011
New Revision: 8168

Log:
Avoid slash in module name since some Python versions do not like this.

Modified:
   Webware/trunk/WebKit/ServletFactory.py

Modified: Webware/trunk/WebKit/ServletFactory.py
==============================================================================
--- Webware/trunk/WebKit/ServletFactory.py	Mon Jul 25 13:46:28 2011	(r8167)
+++ Webware/trunk/WebKit/ServletFactory.py	Fri Jul 29 05:05:23 2011	(r8168)
@@ -122,9 +122,10 @@
         # There is no context, so import the module standalone
         # and give it a unique name:
         if not fullname or not path.startswith(contextPath):
-            remainder = serverSidePathToImport
-            fullname = remainder.replace(
-                '\\', '_').replace('/', '_').replace('.', '_')
+            fullname = serverSidePathToImport
+            if os.sep != '/':
+                fullname = fullname.replace(os.sep, '_')
+            fullname = fullname.replace('/', '_').replace('.', '_')
             name = os.path.splitext(os.path.basename(
                 serverSidePathToImport))[0]
             moduleDir = os.path.dirname(serverSidePathToImport)
@@ -133,13 +134,19 @@
             return module
 
         # First, we'll import the context's package.
+        fullname = request.contextName()
+        if os.sep != '/':
+            fullname = fullname.replace(os.sep, '_')
+        fullname = fullname.replace('/', '_')
         directory, contextDirName = os.path.split(contextPath)
         self._importModuleFromDirectory(fullname, contextDirName,
             directory, isPackageDir=True)
         directory = contextPath
 
         # Now we'll break up the rest of the path into components.
-        remainder = path[len(contextPath)+1:].replace('\\', '/')
+        remainder = path[len(contextPath)+1:]
+        if os.sep != '/':
+            remainder = remainder.replace(os.sep, '/')
         remainder = remainder.split('/')
 
         # Import all subpackages of the context package