You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by jg...@apache.org on 2006/05/20 19:44:51 UTC
svn commit: r408048 - in /httpd/mod_python/trunk/lib/python/mod_python:
Session.py apache.py cache.py psp.py
Author: jgallacher
Date: Sat May 20 10:44:51 2006
New Revision: 408048
URL: http://svn.apache.org/viewvc?rev=408048&view=rev
Log:
Fixed some more indentation problems. Everything in lib/python/mod_python/*py
should now be correctly indented with 4 spaces.
Modified:
httpd/mod_python/trunk/lib/python/mod_python/Session.py
httpd/mod_python/trunk/lib/python/mod_python/apache.py
httpd/mod_python/trunk/lib/python/mod_python/cache.py
httpd/mod_python/trunk/lib/python/mod_python/psp.py
Modified: httpd/mod_python/trunk/lib/python/mod_python/Session.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/Session.py?rev=408048&r1=408047&r2=408048&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/Session.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/Session.py Sat May 20 10:44:51 2006
@@ -56,11 +56,11 @@
g = random.Random(time.time())
result = [g]
for i in range(gennum - 1):
- laststate = g.getstate()
- g = random.Random()
- g.setstate(laststate)
- g.jumpahead(1000000)
- result.append(g)
+ laststate = g.getstate()
+ g = random.Random()
+ g.setstate(laststate)
+ g.jumpahead(1000000)
+ result.append(g)
return result
Modified: httpd/mod_python/trunk/lib/python/mod_python/apache.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/apache.py?rev=408048&r1=408047&r2=408048&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/apache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/apache.py Sat May 20 10:44:51 2006
@@ -638,20 +638,20 @@
mtime = 0
if module.__dict__.has_key("__file__"):
- filepath = module.__file__
+ filepath = module.__file__
- try:
- # this try/except block is a workaround for a Python bug in
- # 2.0, 2.1 and 2.1.1. See
- # http://sourceforge.net/tracker/?group_id=5470&atid=105470&func=detail&aid=422004
+ try:
+ # this try/except block is a workaround for a Python bug in
+ # 2.0, 2.1 and 2.1.1. See
+ # http://sourceforge.net/tracker/?group_id=5470&atid=105470&func=detail&aid=422004
- if os.path.exists(filepath):
- mtime = os.path.getmtime(filepath)
+ if os.path.exists(filepath):
+ mtime = os.path.getmtime(filepath)
- if os.path.exists(filepath[:-1]) :
- mtime = max(mtime, os.path.getmtime(filepath[:-1]))
+ if os.path.exists(filepath[:-1]) :
+ mtime = max(mtime, os.path.getmtime(filepath[:-1]))
- except OSError: pass
+ except OSError: pass
return mtime
Modified: httpd/mod_python/trunk/lib/python/mod_python/cache.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/cache.py?rev=408048&r1=408047&r2=408048&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/cache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/cache.py Sat May 20 10:44:51 2006
@@ -314,8 +314,8 @@
try:
match = re_max_age.match(headers['cache-control'])
if match:
- entry._expires=time()+int(match.group(1))
- expiration = True
+ entry._expires=time()+int(match.group(1))
+ expiration = True
except (KeyError, ValueError):
pass
if not expiration:
Modified: httpd/mod_python/trunk/lib/python/mod_python/psp.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/psp.py?rev=408048&r1=408047&r2=408048&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/psp.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/psp.py Sat May 20 10:44:51 2006
@@ -227,7 +227,7 @@
raise et, ev, etb
finally:
if session is not None:
- session.unlock()
+ session.unlock()
def __str__(self):
self.req.content_type = 'text/html'