summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2016-09-05 22:07:02 (GMT)
committerChristian Heimes <christian@python.org>2016-09-05 22:07:02 (GMT)
commit8c21ab0ab92d7f10a7ada9d5f157ee69c9095e63 (patch)
treec97400f62d485e3b702e6a10969b50d274b5c78d
parent25bfcd5d9eb324128e52d35c508621e017791f2b (diff)
downloadcpython-8c21ab0ab92d7f10a7ada9d5f157ee69c9095e63.zip
cpython-8c21ab0ab92d7f10a7ada9d5f157ee69c9095e63.tar.gz
cpython-8c21ab0ab92d7f10a7ada9d5f157ee69c9095e63.tar.bz2
Issue #27744: correct comment and markup
-rw-r--r--Doc/library/socket.rst2
-rw-r--r--Modules/socketmodule.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index ec793ba..4a2cf11 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -136,7 +136,7 @@ created. Socket addresses are represented as follows:
elements ``(type, name [, feat [, mask]])``, where:
- *type* is the algorithm type as string, e.g. ``aead``, ``hash``,
- ``skcipher`` or ``rng``.
+ ``skcipher`` or ``rng``.
- *name* is the algorithm name and operation mode as string, e.g.
``sha256``, ``hmac(sha256)``, ``cbc(aes)`` or ``drbg_nopr_ctr_aes256``.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 42ae2fb..0b45c33 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2556,7 +2556,7 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args)
}
PyErr_Clear();
- /* setsockopt(level, opt, (None, flag)) */
+ /* setsockopt(level, opt, None, flag) */
if (PyArg_ParseTuple(args, "iiO!I:setsockopt",
&level, &optname, Py_TYPE(Py_None), &none, &optlen)) {
assert(sizeof(socklen_t) >= sizeof(unsigned int));