Changeset Navigation

Changeset 685

Timestamp:

09/27/05 17:11:02

Author:

fumanchu

Message:

Removed redundant KeyboardInterrupt/SystemExit? traps in _cphttpserver (server.py traps them).

Files:

r681	r685
195	195	# interrupts on Win32, which don't interrupt accept() by default
196	196	return 1
197		except (KeyboardInterrupt, SystemExit):
198		cherrypy.log("<Ctrl-C> hit: shutting down http server", "HTTP")
199		self.shutdown()
	197	## except (KeyboardInterrupt, SystemExit):
	198	## cherrypy.log("<Ctrl-C> hit: shutting down http server", "HTTP")
	199	## self.shutdown()
200	200
201	201	def serve_forever(self):
…	…
335	335	try:
336	336	request, client_address = self.get_request()
337		except (KeyboardInterrupt, SystemExit):
338		cherrypy.log("<Ctrl-C> hit: shutting down", "HTTP")
339		return 0
	337	## except (KeyboardInterrupt, SystemExit):
	338	## cherrypy.log("<Ctrl-C> hit: shutting down", "HTTP")
	339	## return 0
340	340	except socket.error, e:
341	341	return 1