git.samba.org
/
jelmer
/
calypso.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
216a249
)
ssl is imported globally
author
Guido Günther
<agx@sigxcpu.org>
Fri, 24 May 2013 12:50:08 +0000
(14:50 +0200)
committer
Guido Günther
<agx@sigxcpu.org>
Tue, 25 Jun 2013 18:07:45 +0000
(20:07 +0200)
no need to import it again.
calypso/__init__.py
patch
|
blob
|
history
diff --git
a/calypso/__init__.py
b/calypso/__init__.py
index 8495702d9f74469aa5b222ec75c05e1440d26d01..e03c7cef759315caab9e1097dfd28c1c8c69373a 100644
(file)
--- a/
calypso/__init__.py
+++ b/
calypso/__init__.py
@@
-112,11
+112,6
@@
class HTTPSServer(HTTPServer):
def __init__(self, address, handler):
"""Create server by wrapping HTTP socket in an SSL socket."""
- # Fails with Python 2.5, import if needed
- # pylint: disable=F0401
- import ssl
- # pylint: enable=F0401
-
HTTPServer.__init__(self, address, handler)
self.socket = ssl.wrap_socket(
socket.socket(self.address_family, self.socket_type),