Issue #20604: Added missed invalid mode in error message of socket.makefile().

serhiy-storchaka · serhiy-storchaka · commit fca2fc090c82 · 2014-11-19T12:33:40.000+02:00
Based on patch by Franck Michea.
diff --git a/Lib/socket.py b/Lib/socket.py
@@ -201,9 +201,8 @@ def makefile(self, mode="r", buffering=None, *,
         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
