diff options
-rw-r--r-- | Lib/socket.py | 2 | ||||
-rw-r--r-- | Lib/test/test_socket.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 8e30ce0..39d5119 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -217,7 +217,7 @@ class _fileobject(object): self._wbuf = [] # A list of strings def _getclosed(self): - return self._sock is not None + return self._sock is None closed = property(_getclosed, doc="True if the file is closed") def close(self): diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index a2b8489..f7bf041 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -590,6 +590,7 @@ class FileObjectClassTestCase(SocketConnectedTest): def tearDown(self): self.serv_file.close() + self.assert_(self.serv_file.closed) self.serv_file = None SocketConnectedTest.tearDown(self) @@ -599,6 +600,7 @@ class FileObjectClassTestCase(SocketConnectedTest): def clientTearDown(self): self.cli_file.close() + self.assert_(self.cli_file.closed) self.cli_file = None SocketConnectedTest.clientTearDown(self) @@ -645,6 +647,12 @@ class FileObjectClassTestCase(SocketConnectedTest): self.cli_file.write(MSG) self.cli_file.flush() + def testClosedAttr(self): + self.assert_(not self.serv_file.closed) + + def _testClosedAttr(self): + self.assert_(not self.cli_file.closed) + class UnbufferedFileObjectClassTestCase(FileObjectClassTestCase): """Repeat the tests from FileObjectClassTestCase with bufsize==0. |