summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-26 15:13:29 (GMT)
committerKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-26 15:13:29 (GMT)
commitc8e7e2bb76b7ebd0206e915b1d20b1cf4e6a75e1 (patch)
tree5946d31e9a93b27c2a729ed560e89837edae3399 /Doc/library
parent00679a7ee0f6fa630c2f709f1d0a761e80181eb7 (diff)
parent36852b7844fd15fb80a9366ea861c2d5159bb51e (diff)
downloadcpython-c8e7e2bb76b7ebd0206e915b1d20b1cf4e6a75e1.zip
cpython-c8e7e2bb76b7ebd0206e915b1d20b1cf4e6a75e1.tar.gz
cpython-c8e7e2bb76b7ebd0206e915b1d20b1cf4e6a75e1.tar.bz2
Merge with 3.2 :
Issue #14574: Ignore socket errors raised when flushing a connection on close.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/socketserver.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 28e8a0a..e7f668c 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -313,8 +313,8 @@ request.
.. method:: RequestHandler.finish()
Called after the :meth:`handle` method to perform any clean-up actions
- required. The default implementation does nothing. If :meth:`setup` or
- :meth:`handle` raise an exception, this function will not be called.
+ required. The default implementation does nothing. If :meth:`setup`
+ raises an exception, this function will not be called.
.. method:: RequestHandler.handle()