Normalize whitespace. [...] (quixote/fcgi.py)
Greg Ward <gward-fVcApmY9cLvQ3/1i3zOLAti2O/[email protected]> Wed, 20 Nov 2002 12:06:08 -0500
| Newsgroups | gmane.comp.web.quixote.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /home/cvs/quixote
In directory hewson:/tmp/cvs-serv18435
Modified Files:
fcgi.py
Log Message:
Normalize whitespace.
Avoid jamming multiple lines of code together with ";".
Wrap long lines.
Index: fcgi.py
===================================================================
RCS file: /home/cvs/quixote/fcgi.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fcgi.py 29 May 2002 00:36:51 -0000 1.7
+++ fcgi.py 20 Nov 2002 17:06:06 -0000 1.8
@@ -61,7 +61,7 @@
# Types of management records
ManagementTypes = [FCGI_GET_VALUES]
-FCGI_NULL_REQUEST_ID=0
+FCGI_NULL_REQUEST_ID = 0
# Masks for flags component of FCGI_BEGIN_REQUEST
FCGI_KEEP_CONN = 1
@@ -86,7 +86,7 @@
def error(msg):
"Append a string to /tmp/err"
- errf=open('/tmp/err', 'a+')
+ errf = open('/tmp/err', 'a+')
errf.write(msg+'\n')
errf.close()
@@ -121,8 +121,8 @@
self.unknownType = ord(content[0])
elif self.recType == FCGI_GET_VALUES or self.recType == FCGI_PARAMS:
- self.values={}
- pos=0
+ self.values = {}
+ pos = 0
while pos < len(content):
name, value, pos = readPair(content, pos)
self.values[name] = value
@@ -139,12 +139,12 @@
elif self.recType == FCGI_UNKNOWN_TYPE:
content = pack(">Bxxxxxx", self.unknownType)
- elif self.recType==FCGI_GET_VALUES or self.recType==FCGI_PARAMS:
+ elif self.recType == FCGI_GET_VALUES or self.recType == FCGI_PARAMS:
content = ""
for i in self.values.keys():
content = content + writePair(i, self.values[i])
- elif self.recType==FCGI_END_REQUEST:
+ elif self.recType == FCGI_END_REQUEST:
content = pack(">IBxxx", self.appStatus, self.protocolStatus)
cLen = len(content)
@@ -162,11 +162,11 @@
_lowbits = ~(1 << 31) # everything but the highest bit
def readPair(s, pos):
- nameLen = ord(s[pos]) ; pos=pos+1
+ nameLen = ord(s[pos]) ; pos = pos+1
if nameLen & 128:
pos = pos + 3
nameLen = int(struct.unpack(">I", s[pos-4:pos])[0] & _lowbits)
- valueLen = ord(s[pos]) ; pos=pos+1
+ valueLen = ord(s[pos]) ; pos = pos+1
if valueLen & 128:
pos = pos + 3
valueLen = int(struct.unpack(">I", s[pos-4:pos])[0] & _lowbits)
@@ -176,7 +176,7 @@
#---------------------------------------------------------------------------
_highbit = (1 << 31)
-
+
def writePair(name, value):
l = len(name)
if l < 128:
@@ -195,13 +195,13 @@
def HandleManTypes(r, conn):
if r.recType == FCGI_GET_VALUES:
r.recType = FCGI_GET_VALUES_RESULT
- v={}
- vars={'FCGI_MAX_CONNS' : FCGI_MAX_CONNS,
- 'FCGI_MAX_REQS' : FCGI_MAX_REQS,
- 'FCGI_MPXS_CONNS': FCGI_MPXS_CONNS}
+ v = {}
+ vars = {'FCGI_MAX_CONNS' : FCGI_MAX_CONNS,
+ 'FCGI_MAX_REQS' : FCGI_MAX_REQS,
+ 'FCGI_MPXS_CONNS': FCGI_MPXS_CONNS}
for i in r.values.keys():
- if vars.has_key(i): v[i]=vars[i]
- r.values=vars
+ if vars.has_key(i): v[i] = vars[i]
+ r.values = vars
r.writeRecord(conn)
#---------------------------------------------------------------------------
@@ -235,32 +235,34 @@
return
if os.environ.has_key('FCGI_WEB_SERVER_ADDRS'):
- good_addrs=string.split(os.environ['FCGI_WEB_SERVER_ADDRS'], ',')
- good_addrs=map(string.strip, good_addrs) # Remove whitespace
+ good_addrs = string.split(os.environ['FCGI_WEB_SERVER_ADDRS'], ',')
+ good_addrs = map(string.strip, good_addrs) # Remove whitespace
else:
- good_addrs=None
+ good_addrs = None
- self.conn, addr=_sock.accept()
- stdin, data="", ""
+ self.conn, addr = _sock.accept()
+ stdin, data = "", ""
self.env = {}
- self.requestId=0
- remaining=1
+ self.requestId = 0
+ remaining = 1
# Check if the connection is from a legal address
- if good_addrs!=None and addr not in good_addrs:
+ if good_addrs != None and addr not in good_addrs:
raise error, 'Connection from invalid server!'
while remaining:
- r=record(); r.readRecord(self.conn)
+ r = record()
+ r.readRecord(self.conn)
if r.recType in ManagementTypes:
HandleManTypes(r, self.conn)
- elif r.reqId==0:
+ elif r.reqId == 0:
# Oh, poopy. It's a management record of an unknown
# type. Signal the error.
- r2=record()
- r2.recType=FCGI_UNKNOWN_TYPE ; r2.unknownType=r.recType
+ r2 = record()
+ r2.recType = FCGI_UNKNOWN_TYPE
+ r2.unknownType = r.recType
r2.writeRecord(self.conn)
continue # Charge onwards
@@ -275,28 +277,28 @@
# Begin a new request
if r.recType == FCGI_BEGIN_REQUEST:
self.requestId = r.reqId
- if r.role == FCGI_AUTHORIZER: remaining=1
- elif r.role == FCGI_RESPONDER: remaining=2
- elif r.role == FCGI_FILTER: remaining=3
+ if r.role == FCGI_AUTHORIZER: remaining = 1
+ elif r.role == FCGI_RESPONDER: remaining = 2
+ elif r.role == FCGI_FILTER: remaining = 3
elif r.recType == FCGI_PARAMS:
if r.content == "":
- remaining=remaining-1
+ remaining = remaining-1
else:
for i in r.values.keys():
self.env[i] = r.values[i]
elif r.recType == FCGI_STDIN:
if r.content == "":
- remaining=remaining-1
+ remaining = remaining-1
else:
- stdin=stdin+r.content
+ stdin = stdin+r.content
- elif r.recType==FCGI_DATA:
+ elif r.recType == FCGI_DATA:
if r.content == "":
- remaining=remaining-1
+ remaining = remaining-1
else:
- data=data+r.content
+ data = data+r.content
# end of while remaining:
self.inp = StringIO(stdin)
@@ -318,7 +320,7 @@
##debug = open("/tmp/quixote-debug.log", "a+")
##debug.write("fcgi.FCGI.Finish():\n")
- r=record()
+ r = record()
r.recType = FCGI_STDERR
r.reqId = self.requestId
data = self.err.read()
@@ -329,7 +331,8 @@
##debug.write(" chunk, data = %s, %s\n" % (`chunk`, `data`))
r.content = chunk
r.writeRecord(self.conn)
- r.content="" ; r.writeRecord(self.conn) # Terminate stream
+ r.content = ""
+ r.writeRecord(self.conn) # Terminate stream
r.recType = FCGI_STDOUT
data = self.out.read()
@@ -339,13 +342,14 @@
chunk, data = self.getNextChunk(data)
r.content = chunk
r.writeRecord(self.conn)
- r.content="" ; r.writeRecord(self.conn) # Terminate stream
+ r.content = ""
+ r.writeRecord(self.conn) # Terminate stream
- r=record()
- r.recType=FCGI_END_REQUEST
- r.reqId=self.requestId
- r.appStatus=status
- r.protocolStatus=FCGI_REQUEST_COMPLETE
+ r = record()
+ r.recType = FCGI_END_REQUEST
+ r.reqId = self.requestId
+ r.appStatus = status
+ r.protocolStatus = FCGI_REQUEST_COMPLETE
r.writeRecord(self.conn)
self.conn.close()
@@ -359,7 +363,9 @@
if method == 'GET':
return cgi.FieldStorage(environ=self.env, keep_blank_values=1)
else:
- return cgi.FieldStorage(fp=self.inp, environ=self.env, keep_blank_values=1)
+ return cgi.FieldStorage(fp=self.inp,
+ environ=self.env,
+ keep_blank_values=1)
def getNextChunk(self, data):
chunk = data[:8192]
@@ -376,14 +382,14 @@
if sys.platform[:3] == 'win':
_isFCGI = 0
return
-
+
_init = 1
try:
- s=socket.fromfd(sys.stdin.fileno(), socket.AF_INET,
- socket.SOCK_STREAM)
+ s = socket.fromfd(sys.stdin.fileno(), socket.AF_INET,
+ socket.SOCK_STREAM)
s.getpeername()
except socket.error, (err, errmsg):
- if err!=errno.ENOTCONN: # must be a non-fastCGI environment
+ if err != errno.ENOTCONN: # must be a non-fastCGI environment
_isFCGI = 0
return
@@ -393,18 +399,20 @@
#---------------------------------------------------------------------------
def _test():
- counter=0
+ counter = 0
try:
while isFCGI():
req = Accept()
- counter=counter+1
+ counter = counter+1
try:
fs = req.getFieldStorage()
size = string.atoi(fs['size'].value)
doc = ['*' * size]
except:
- doc = ['<HTML><HEAD><TITLE>FCGI TestApp</TITLE></HEAD>\n<BODY>\n']
+ doc = ['<HTML><HEAD>'
+ '<TITLE>FCGI TestApp</TITLE>'
+ '</HEAD>\n<BODY>\n']
doc.append('<H2>FCGI TestApp</H2><P>')
doc.append('<b>request count</b> = %d<br>' % counter)
doc.append('<b>pid</b> = %s<br>' % os.getpid())
@@ -416,9 +424,11 @@
for k in keys:
val = fs[k]
if type(val) == type([]):
- doc.append(' <b>%-15s :</b> %s\n' % (k, val))
+ doc.append(' <b>%-15s :</b> %s\n'
+ % (k, val))
else:
- doc.append(' <b>%-15s :</b> %s\n' % (k, val.value))
+ doc.append(' <b>%-15s :</b> %s\n'
+ % (k, val.value))
doc.append('</pre>')
@@ -446,7 +456,7 @@
traceback.print_exc( file = f )
# f.write('%s' % doc)
-if __name__=='__main__':
+if __name__ == '__main__':
#import pdb
#pdb.run('_test()')
_test()