Remaining white-space clean-up.

Author: Cito

.checksrc.config

@@ -1,6 +1,6 @@
 # .checksrc.config
 {
-	'DisableErrors': {
-		'UncapFN': ['clean', 'install'],
-	}
+    'DisableErrors': {
+        'UncapFN': ['clean', 'install'],
+    }
 }

CGIWrapper/Docs/UsersGuide.phtml

@@ -24,12 +24,12 @@
 <p>The wrapper provides the following benefits:</p>
 
 <ul>
-	<li>Sets up global variables <em>headers</em>, <em>fields</em>, <em>env</em>, <em>wrapper</em> and <em>WebUtils</em>  for use by the target script.</li>
-	<li>Catches exceptions that the target script doesn't in order to provide a meaningful message to the web page reader and useful debugging information to the developer.</li>
-	<li>Logs the date, time, duration and name of the target script for usage statistics and performance monitoring.</li>
-	<li>Simplifies URLs by leaving out the extension and possibly the location of the script. This also hides the nature of the implementation of the page from the browser of your site.</li>
-	<li>Provides a hook for integrating an object for cookies.</li>
-	<li>Provides a hook for class-based CGIs.</li>
+  <li>Sets up global variables <em>headers</em>, <em>fields</em>, <em>env</em>, <em>wrapper</em> and <em>WebUtils</em>  for use by the target script.</li>
+  <li>Catches exceptions that the target script doesn't in order to provide a meaningful message to the web page reader and useful debugging information to the developer.</li>
+  <li>Logs the date, time, duration and name of the target script for usage statistics and performance monitoring.</li>
+  <li>Simplifies URLs by leaving out the extension and possibly the location of the script. This also hides the nature of the implementation of the page from the browser of your site.</li>
+  <li>Provides a hook for integrating an object for cookies.</li>
+  <li>Provides a hook for class-based CGIs.</li>
 </ul>
 
 <p>You don't have to immediately write code to play with CGI Wrapper. There are several samples included. See <a href="#Running">Running and Testing</a> below.</p>
@@ -42,29 +42,29 @@
 <table align="center" cellspacing="0" cellpadding="4" border="1" width="80%">
 <tr><th>Global</th> <th>Type/Class</th> <th>Description</th> </tr>
 <tr>
-	<td><code>headers</code> </td>
-	<td>dictionary </td>
-	<td>Contains all the HTTP headers that will be sent back to the client. The default contents are 'Content-type': 'text/html'. Often, the headers don't need to be modified at all. One popular use of the headers is 'Redirect': 'someURL' to point the client to a different place. </td>
+  <td><code>headers</code> </td>
+  <td>dictionary </td>
+  <td>Contains all the HTTP headers that will be sent back to the client. The default contents are 'Content-type': 'text/html'. Often, the headers don't need to be modified at all. One popular use of the headers is 'Redirect': 'someURL' to point the client to a different place. </td>
 </tr>
 <tr>
-	<td><code>fields</code> </td>
-	<td>cgi.FieldStorage </td>
-	<td>This instance of FieldStorage comes from the standard Python cgi module. Typical uses include <code>fields.has_key('someField')</code> and <code>fields['someField'].value</code>. See the Python standard module documentation for cgi for more information. </td>
+  <td><code>fields</code> </td>
+  <td>cgi.FieldStorage </td>
+  <td>This instance of FieldStorage comes from the standard Python cgi module. Typical uses include <code>fields.has_key('someField')</code> and <code>fields['someField'].value</code>. See the Python standard module documentation for cgi for more information. </td>
 </tr>
 <tr>
-	<td><code>environ</code> </td>
-	<td>dictionary </td>
-	<td>This dictionary represents the environment variables passed to the CGI scripts. Scripts should use this rather than <code>os.environ</code> since future versions of CGI Wrapper could be tightly integrated into web servers, thereby changing the nature of how environment variables get passed around (e.g., no longer through the OS). Also, note that the environment may seem a little non-standard to the target CGI script since the web server is setting it up to run the CGI Wrapper instead. In most CGI scripts (that execute under the wrapper), the environment is not even needed. </td>
+  <td><code>environ</code> </td>
+  <td>dictionary </td>
+  <td>This dictionary represents the environment variables passed to the CGI scripts. Scripts should use this rather than <code>os.environ</code> since future versions of CGI Wrapper could be tightly integrated into web servers, thereby changing the nature of how environment variables get passed around (e.g., no longer through the OS). Also, note that the environment may seem a little non-standard to the target CGI script since the web server is setting it up to run the CGI Wrapper instead. In most CGI scripts (that execute under the wrapper), the environment is not even needed. </td>
 </tr>
 <tr>
-	<td><code>wrapper</code> </td>
-	<td>CGIWrapper </td>
-	<td>This is a pointer back to the CGI Wrapper instance. This allows CGI scripts to communicate with the wrapper if they want. However, this is hardly ever needed. </td>
+  <td><code>wrapper</code> </td>
+  <td>CGIWrapper </td>
+  <td>This is a pointer back to the CGI Wrapper instance. This allows CGI scripts to communicate with the wrapper if they want. However, this is hardly ever needed. </td>
 </tr>
 <tr>
-	<td><code>cookies</code> </td>
-	<td>Cookie </td>
-	<td>This global is <b>not</b> set up by the wrapper, but is looked for upon exit of the CGI script. See the <em>Cookies</em> section below for more information. </td>
+  <td><code>cookies</code> </td>
+  <td>Cookie </td>
+  <td>This global is <b>not</b> set up by the wrapper, but is looked for upon exit of the CGI script. See the <em>Cookies</em> section below for more information. </td>
 </tr>
 </table>
 
@@ -74,11 +74,11 @@
 <p>One of the main benefits of the wrapper is the handling of uncaught exceptions raised by target CGI scripts. The typical behavior of the wrapper upon detecting an uncaught exception is:</p>
 
 <ol>
-	<li>Log the time, error, script name and traceback to <code>stderr</code>. This information will typically appear in the web server's error log.</li>
-	<li>Display a web page containing an apologetic message to the user and useful debugging information for developers.</li>
-	<li>Save the above web page to a file so that developers can look at it after-the-fact. These HTML-based error messages are stored one-per-file, if the <code>SaveErrorMessages</code> setting is true (the default). They are stored in the directory named by the <code>ErrorMessagesDir</code> (defaults to 'ErrorMsgs').</li>
-	<li>Add an entry to the CGI Wrapper's error log, called <i>Errors.csv</i>.</li>
-	<li>E-mail the error message if the <code>EmailErrors</code> setting is true, using the settings <code>ErrorEmailServer</code> and <code>ErrorEmailHeaders</code>.</li>
+  <li>Log the time, error, script name and traceback to <code>stderr</code>. This information will typically appear in the web server's error log.</li>
+  <li>Display a web page containing an apologetic message to the user and useful debugging information for developers.</li>
+  <li>Save the above web page to a file so that developers can look at it after-the-fact. These HTML-based error messages are stored one-per-file, if the <code>SaveErrorMessages</code> setting is true (the default). They are stored in the directory named by the <code>ErrorMessagesDir</code> (defaults to 'ErrorMsgs').</li>
+  <li>Add an entry to the CGI Wrapper's error log, called <i>Errors.csv</i>.</li>
+  <li>E-mail the error message if the <code>EmailErrors</code> setting is true, using the settings <code>ErrorEmailServer</code> and <code>ErrorEmailHeaders</code>.</li>
 </ol>
 
 <p>Archived error messages can be browsed through the <a href="#Administration">administration page</a>.</p>
@@ -386,21 +386,21 @@ A list of IP addresses or networks from which admin scripts can be accessed.
 <a name="ToDo"></a><h3>To Do</h3>
 
 <ol>
-	<li>Examples: Make a Cookie example. (In the meantime, just see the main doc string of Cookie.py in WebUtils.)</li>
-	<li>Wrapper: When a script produces no output, the CGI Wrapper should report that problem. (This most often happens for class based CGIs with incorrect class names.)</li>
-	<li>Wrapper: There should probably be an option to clear the output of a script that raised an uncaught exception. Sometimes that could help in debugging.</li>
-	<li>Admin: Create a summary page for the script and error logs.</li>
-	<li>Wrapper: It's intended that the CGIWrapper class could be embedded in a server and a single instance reused several times. The class is not quite there yet.</li>
-	<li>Wrapper: CGI scripts never get cached as byte code (.pyc) which would provide a performance boost.</li>
-	<li>Wrapper: The error log columns should be configurable just like the script log columns.</li>
-	<li>Code review: Misc functions towards bottom of CGIWrapper</li>
-	<li>Code review: Use of _realStdout and sys.stdout on multiple serve() calls.</li>
-	<li>Wrapper: Create a subclass of Python's CGI server that uses CGIWrapper. This would include caching the byte code in memory.</li>
-	<li>Wrapper: htmlErrorPageFilename() uses a "mostly works" technique that could be better. See source.</li>
-	<li>Wrapper: Keep a list of file extensions (such as .py .html .pl) mapped to their handlers. When processing a URL, iterate through the list until a file with that extension is found, then serve it up through its handler.</li>
-	<li>Admin: Add password protection on the administration scripts.</li>
-	<li>Wrapper: Provide integration (and therefore increased performance) with web servers such as Apache.</li>
-	<li>Wrapper: Error e-mails are always in HTML format. It may be useful to have a plain text version for those with more primitive e-mail clients.</li>
+  <li>Examples: Make a Cookie example. (In the meantime, just see the main doc string of Cookie.py in WebUtils.)</li>
+  <li>Wrapper: When a script produces no output, the CGI Wrapper should report that problem. (This most often happens for class based CGIs with incorrect class names.)</li>
+  <li>Wrapper: There should probably be an option to clear the output of a script that raised an uncaught exception. Sometimes that could help in debugging.</li>
+  <li>Admin: Create a summary page for the script and error logs.</li>
+  <li>Wrapper: It's intended that the CGIWrapper class could be embedded in a server and a single instance reused several times. The class is not quite there yet.</li>
+  <li>Wrapper: CGI scripts never get cached as byte code (.pyc) which would provide a performance boost.</li>
+  <li>Wrapper: The error log columns should be configurable just like the script log columns.</li>
+  <li>Code review: Misc functions towards bottom of CGIWrapper</li>
+  <li>Code review: Use of _realStdout and sys.stdout on multiple serve() calls.</li>
+  <li>Wrapper: Create a subclass of Python's CGI server that uses CGIWrapper. This would include caching the byte code in memory.</li>
+  <li>Wrapper: htmlErrorPageFilename() uses a "mostly works" technique that could be better. See source.</li>
+  <li>Wrapper: Keep a list of file extensions (such as .py .html .pl) mapped to their handlers. When processing a URL, iterate through the list until a file with that extension is found, then serve it up through its handler.</li>
+  <li>Admin: Add password protection on the administration scripts.</li>
+  <li>Wrapper: Provide integration (and therefore increased performance) with web servers such as Apache.</li>
+  <li>Wrapper: Error e-mails are always in HTML format. It may be useful to have a plain text version for those with more primitive e-mail clients.</li>
 </ol>
 
 

CGIWrapper/Examples/Colors.py

@@ -22,7 +22,7 @@
 ''' % (bgcolorArg, bgcolor)
 
 space = ' '*10
-gamma = 2.2  # an approximation for today's CRTs, see "brightness =" below
+gamma = 2.2 # an approximation for today's CRTs, see "brightness =" below
 
 for r in range(11):
     r /= 10.0

COMKit/Examples/ADOSample.py

@@ -15,6 +15,7 @@
 # can be shared among many servlets.
 
 from win32com.client import Dispatch
+
 from ExamplePage import ExamplePage
 
 
@@ -39,11 +40,13 @@ def recordset(self, sql):
 
     def writeContent(self):
         # Grab some data from the database and display it
-        rs = self.recordset('SELECT CustomerName FROM Customers ORDER BY CustomerName')
-        self.writeln('<h1>ADO Sample</h1>')
-        self.writeln('<h3>Your Customers are:</h3>')
-        self.writeln('<ul>')
+        wr = self.writeln
+        wr('<h1>ADO Sample</h1>')
+        wr('<h3>Your Customers are:</h3>')
+        rs = self.recordset(
+            'SELECT CustomerName FROM Customers ORDER BY CustomerName')
+        wr('<ul>')
         while not rs.EOF:
-            self.writeln('<li>%s</li>' % rs.Fields('CustomerName').Value)
+            wr('<li>%s</li>' % rs.Fields('CustomerName').Value)
             rs.MoveNext()
-        self.writeln('</ul>')
+        wr('</ul>')

COMKit/Properties.py

@@ -3,7 +3,7 @@
 version = ('X', 'Y', 0)
 
 docs = [
-        {'name': "User's Guide", 'file': 'UsersGuide.html'},
+    {'name': "User's Guide", 'file': 'UsersGuide.html'},
 ]
 
 status = 'stable'
@@ -15,7 +15,7 @@
 requiredOpSys = 'nt'
 
 requiredSoftware = [
-        {'name': 'pythoncom'},
+    {'name': 'pythoncom'},
 ]
 
 def willRunFunc():
@@ -28,8 +28,8 @@ def willRunFunc():
         for soft in requiredSoftware:
             imp.find_module(soft['name'])
     except ImportError:
-        success = 0
+        success = False
     else:
-        success = 1
+        success = True
     if not success:
         return 'The pythoncom module (pywin32 library) is required to use COMKit.'

DocSupport/.checksrc.config

@@ -1,4 +1,4 @@
 # checksrc.config
 {
-	'SkipFiles': ['autotoc', 'pytp', 'py2html']
+    'SkipFiles': ['autotoc', 'pytp', 'py2html']
 }

DocSupport/PySummary.config

@@ -1,6 +1,6 @@
 {
     'html': {
-        'tabSubstitute': ' '*4,  # eg, 4 spaces per tab
+        'tabSubstitute': ' '*4, # eg, 4 spaces per tab
         'file': ('''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -30,16 +30,16 @@ or the <a href="../Docs/%(package)s.html">generated documentation</a>.</p>
 </body>
 </html>'''),
 
-        'class':    ('\n', ''),
-        'def':      ('', ''),
+        'class': ('\n', ''),
+        'def': ('', ''),
         'category': ('\n', ''),
     },
 
     'text': {
-        'tabSubstitute': ' '*4,  # eg, 4 spaces per tab
-        'file':          ('', ''),
-        'class':         ('\n', ''),
-        'def':           ('', ''),
-        'category':      ('\n', ''),
+        'tabSubstitute': ' '*4, # eg, 4 spaces per tab
+        'file': ('', ''),
+        'class': ('\n', ''),
+        'def': ('', ''),
+        'category': ('\n', ''),
     },
 }

DocSupport/RelNotesTemplate.phtml

@@ -4,37 +4,37 @@
 
 <a name="Introduction"></a><h2>Introduction</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="MajorChanges"></a><h2>Major Changes</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="NewFeatures"></a><h2>New Features</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="Improvements"></a><h2>Improvements and Refinements</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="Security"></a><h2>Security</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="MinorChanges"></a><h2>Minor API Changes</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
 <a name="Bugfixes"></a><h2>Bugfixes</h2>
 <ul>
-	<li>...</li>
+  <li>...</li>
 </ul>
 
-<% footer() %>
+<% footer() %>