summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-26 23:08:35 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-26 23:08:35 (GMT)
commitf07d5589c0e7af4274b085d239983f4fc5bfc6b3 (patch)
tree2b4e69b2103ef708084650f6fa4b1b7a70c750f4 /Lib/ssl.py
parent28f7ab6402379b53e6ba0b37172c07a28b0726ac (diff)
downloadcpython-f07d5589c0e7af4274b085d239983f4fc5bfc6b3.zip
cpython-f07d5589c0e7af4274b085d239983f4fc5bfc6b3.tar.gz
cpython-f07d5589c0e7af4274b085d239983f4fc5bfc6b3.tar.bz2
Merged revisions 80517 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80517 | antoine.pitrou | 2010-04-27 01:06:26 +0200 (mar., 27 avril 2010) | 3 lines Remove unused import ........
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 68487bd..ec64469 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -82,7 +82,6 @@ from socket import socket, AF_INET, SOCK_STREAM
import base64 # for DER-to-PEM translation
import traceback
import errno
-import time
class SSLSocket(socket):