There was an error while loading. Please reload this page.
1 parent 9e92f96 commit aa4f98aCopy full SHA for aa4f98a
2 files changed
Lib/test/test_ssl.py
@@ -754,7 +754,6 @@ def test_tls_unique_channel_binding(self):
754
with test_wrap_socket(s, server_side=True, certfile=CERTFILE) as ss:
755
self.assertIsNone(ss.get_channel_binding("tls-unique"))
756
757
- @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "<ssl.SSLSocket fd=3, family=2, type=1, proto=0, laddr=('0.0.0.0', 0)>" not found in "unclosed <socket.socket fd=3, family=2, type=1, proto=0, laddr=('0.0.0.0', 0)>"
758
def test_dealloc_warn(self):
759
ss = test_wrap_socket(socket.socket(socket.AF_INET))
760
r = repr(ss)
crates/stdlib/src/socket.rs
@@ -1378,23 +1378,11 @@ mod _socket {
1378
fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> {
1379
// Emit ResourceWarning if socket is still open
1380
if zelf.sock.read().is_some() {
1381
- let laddr = if let Ok(sock) = zelf.sock()
1382
- && let Ok(addr) = sock.local_addr()
1383
- && let Ok(repr) = get_addr_tuple(&addr, vm).repr(vm)
1384
- {
1385
- format!(", laddr={}", repr.as_wtf8())
1386
- } else {
1387
- String::new()
1388
- };
1389
-
1390
- let msg = format!(
1391
- "unclosed <socket.socket fd={}, family={}, type={}, proto={}{}>",
1392
- zelf.fileno(),
1393
- zelf.family.load(),
1394
- zelf.kind.load(),
1395
- zelf.proto.load(),
1396
- laddr
1397
- );
+ let repr = zelf
+ .as_object()
+ .repr(vm)
+ .unwrap_or_else(|_| vm.ctx.new_str("<socket>"));
+ let msg = format!("unclosed {}", repr.as_wtf8());
1398
let _ = crate::vm::warn::warn(
1399
vm.ctx.new_str(msg).into(),
1400
Some(vm.ctx.exceptions.resource_warning.to_owned()),
0 commit comments