svn commit: r209227 - in /httpd/mod_python/trunk/lib/python/mod_python: Session.py testhandler.py

[nl...@apache.org]

Author: nlehuen
Date: Mon Jul  4 23:16:33 2005
New Revision: 209227

URL: http://svn.apache.org/viewcvs?rev=209227&view=rev
Log:
- Importing os.path is not required.
- testhandler now checks for req.server.error_fname before trying to display it.

Modified:
    httpd/mod_python/trunk/lib/python/mod_python/Session.py
    httpd/mod_python/trunk/lib/python/mod_python/testhandler.py

Modified: httpd/mod_python/trunk/lib/python/mod_python/Session.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/Session.py?rev=209227&r1=209226&r2=209227&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/Session.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/Session.py Mon Jul  4 23:16:33 2005
@@ -20,7 +20,7 @@
 import apache, Cookie
 import _apache
 
-import os, os.path
+import os
 import stat
 import time
 import anydbm, whichdb

Modified: httpd/mod_python/trunk/lib/python/mod_python/testhandler.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/testhandler.py?rev=209227&r1=209226&r2=209227&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/testhandler.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/testhandler.py Mon Jul  4 23:16:33 2005
@@ -24,7 +24,7 @@
 """
 
 from mod_python import apache, util
-import sys, os.path
+import sys, os
 
 class bounded_buffer(object):
     """
@@ -117,10 +117,16 @@
         'Apache document root',
         req.document_root()
     ))
-    req.write('<tr><td><code>%s</code></td><td><code>%s</code> (<a href="?view_log=1" target="_new">view last 100 lines</a>)</td></tr>\n'%(
-        'Apache error log',
-        os.path.join(apache.server_root(),req.server.error_fname)
-    ))
+    if req.server.error_fname:
+        req.write('<tr><td><code>%s</code></td><td><code>%s</code> (<a href="?view_log=1" target="_new">view last 100 lines</a>)</td></tr>\n'%(
+            'Apache error log',
+            os.path.join(apache.server_root(),req.server.error_fname)
+        ))
+    else:
+        req.write('<tr><td><code>%s</code></td><td><code>%s</code></td></tr>\n'%(
+            'Apache error log',
+            'None'
+        ))
     req.write('<tr><td><code>%s</code></td><td><code>%s</code></td></tr>\n'%(
         'Python sys.version',
         sys.version