From: Andy T. <an...@us...> - 2005-09-18 03:59:39
|
Update of /cvsroot/pythoncard/PythonCard/samples/webserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9735/samples/webserver Modified Files: oldModsWebserver.py webserver.py Log Message: Making blanket except clauses more specific Index: webserver.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/webserver/webserver.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** webserver.py 3 Nov 2004 19:50:58 -0000 1.26 --- webserver.py 18 Sep 2005 03:59:22 -0000 1.27 *************** *** 88,92 **** try: self.validIPList.append(socket.gethostbyname(socket.gethostname())) ! except: pass self.allowAny = 0 --- 88,92 ---- try: self.validIPList.append(socket.gethostbyname(socket.gethostname())) ! except Exception, msg: pass self.allowAny = 0 Index: oldModsWebserver.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/webserver/oldModsWebserver.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oldModsWebserver.py 28 Jul 2004 17:05:54 -0000 1.1 --- oldModsWebserver.py 18 Sep 2005 03:59:22 -0000 1.2 *************** *** 204,208 **** os.dup2(self.wfile.fileno(), 1) os.execve(scriptfile, args, env) ! except: self.server.handle_error(self.request, self.client_address) os._exit(127) --- 204,208 ---- os.dup2(self.wfile.fileno(), 1) os.execve(scriptfile, args, env) ! except Exception, msg: # Should test for a particular Exception self.server.handle_error(self.request, self.client_address) os._exit(127) *************** *** 228,232 **** try: nbytes = int(length) ! except: nbytes = 0 files = popenx(cmdline, 'b') --- 228,232 ---- try: nbytes = int(length) ! except Exception, msg: # Should test for a particular Exception nbytes = 0 files = popenx(cmdline, 'b') *************** *** 335,339 **** lastModified = date_time_string(s[8]) size = str(s[6]) ! except: mdt = None lastModified = None --- 335,339 ---- lastModified = date_time_string(s[8]) size = str(s[6]) ! except Exception, msg: # Should test for a particular exception mdt = None lastModified = None |