merge 3.3 (#16900)

benjaminp · benjaminp · commit f86b3c394ce8 · 2013-01-10T14:16:42.000-06:00
diff --git a/Lib/ssl.py b/Lib/ssl.py
@@ -604,10 +604,6 @@ def get_channel_binding(self, cb_type="tls-unique"):
             return None
         return self._sslobj.tls_unique_cb()
 
-    def __del__(self):
-        # sys.stderr.write("__del__ on %s\n" % repr(self))
-        self._real_close()
-
 
 def wrap_socket(sock, keyfile=None, certfile=None,
                 server_side=False, cert_reqs=CERT_NONE,
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -383,6 +383,14 @@ def test_tls_unique_channel_binding(self):
         ss = ssl.wrap_socket(s, server_side=True, certfile=CERTFILE)
         self.assertIsNone(ss.get_channel_binding("tls-unique"))
 
+    def test_dealloc_warn(self):
+        ss = ssl.wrap_socket(socket.socket(socket.AF_INET))
+        r = repr(ss)
+        with self.assertWarns(ResourceWarning) as cm:
+            ss = None
+            support.gc_collect()
+        self.assertIn(r, str(cm.warning.args[0]))
+
 class ContextTests(unittest.TestCase):
 
     @skip_if_broken_ubuntu_ssl
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -212,6 +212,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #16900: Issue a ResourceWarning when an ssl socket is left unclosed.
+
 - Issue #15545: Fix regression in sqlite3's iterdump method where it was
   failing if the connection used a row factory (such as sqlite3.Row) that
   produced unsortable objects. (Regression was introduced by fix for 9750).
