summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-29 12:33:28 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-01-29 12:33:28 (GMT)
commit3e48d77bcba1eb5bf569ab7699f8b54775254d0a (patch)
tree7dd2c7fa96b756dddaa828b184b6132a998ddbf8 /Lib
parent52fa138aac5d9c165eb6aaf64442557e522002ce (diff)
parent54a231d5397bda24257f253eb1aaabf1b741a0b5 (diff)
downloadcpython-3e48d77bcba1eb5bf569ab7699f8b54775254d0a.zip
cpython-3e48d77bcba1eb5bf569ab7699f8b54775254d0a.tar.gz
cpython-3e48d77bcba1eb5bf569ab7699f8b54775254d0a.tar.bz2
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asyncio/protocols.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/asyncio/protocols.py b/Lib/asyncio/protocols.py
index 52fc25c..80fcac9 100644
--- a/Lib/asyncio/protocols.py
+++ b/Lib/asyncio/protocols.py
@@ -78,6 +78,11 @@ class Protocol(BaseProtocol):
State machine of calls:
start -> CM [-> DR*] [-> ER?] -> CL -> end
+
+ * CM: connection_made()
+ * DR: data_received()
+ * ER: eof_received()
+ * CL: connection_lost()
"""
def data_received(self, data):