Follow-up of r67300: correct a failure in socket.makefile().
SocketIO objects now always have 'name' and 'mode' attributes.
diff --git a/Lib/socket.py b/Lib/socket.py
index fcbc545..5578b13 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -149,8 +149,6 @@
if buffering == 0:
if not binary:
raise ValueError("unbuffered streams must be binary")
- raw.name = self.fileno()
- raw.mode = mode
return raw
if reading and writing:
buffer = io.BufferedRWPair(raw, raw, buffering)
@@ -160,11 +158,8 @@
assert writing
buffer = io.BufferedWriter(raw, buffering)
if binary:
- buffer.name = self.fileno()
- buffer.mode = mode
return buffer
text = io.TextIOWrapper(buffer, encoding, newline)
- text.name = self.fileno()
text.mode = mode
return text
@@ -230,6 +225,14 @@
def fileno(self):
return self._sock.fileno()
+ @property
+ def name(self):
+ return self._sock.fileno()
+
+ @property
+ def mode(self):
+ return self._mode
+
def close(self):
if self.closed:
return