remove duplicate close() from ssl.py; expose unwrap and add test for it
diff --git a/Lib/ssl.py b/Lib/ssl.py
index e45e16b..c9ee71a 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -234,15 +234,19 @@
else:
return 0
+ def unwrap (self):
+ if self._sslobj:
+ s = self._sslobj.shutdown()
+ self._sslobj = None
+ return s
+ else:
+ raise ValueError("No SSL wrapper around " + str(self))
+
def shutdown (self, how):
self._sslobj = None
socket.shutdown(self, how)
def close (self):
- self._sslobj = None
- socket.close(self)
-
- def close (self):
if self._makefile_refs < 1:
self._sslobj = None
socket.close(self)