From fca2fc090c8227e8693a2b53dcdafd80bef06c1f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 19 Nov 2014 12:33:40 +0200 Subject: [PATCH] Issue #20604: Added missed invalid mode in error message of socket.makefile(). Based on patch by Franck Michea. --- Lib/socket.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/socket.py b/Lib/socket.py index fd2a7d4f8c1..22d7ad567be 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -201,9 +201,8 @@ class socket(_socket.socket): except the only mode characters supported are 'r', 'w' and 'b'. The semantics are similar too. (XXX refactor to share code?) """ - for c in mode: - if c not in {"r", "w", "b"}: - raise ValueError("invalid mode %r (only r, w, b allowed)") + if not set(mode) <= {"r", "w", "b"}: + raise ValueError("invalid mode %r (only r, w, b allowed)" % (mode,)) writing = "w" in mode reading = "r" in mode or not writing assert reading or writing