diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-23 17:06:39 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-23 17:06:39 -0600 |
| commit | f9284ae8ede5b8977248a4259eee0cd81a100c16 (patch) | |
| tree | b3430fd55e6b76ee01dfd6ac4a0baa52de7b7a3a /Lib/ssl.py | |
| parent | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c (diff) | |
| parent | 7243b574e5fc6f9ae68dc5ebd8252047b8e78e3b (diff) | |
| download | cpython-git-f9284ae8ede5b8977248a4259eee0cd81a100c16.tar.gz | |
merge 3.4 (#22921)
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py index 726bc7b106..3d132b2f7c 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -655,12 +655,7 @@ class SSLSocket(socket): raise ValueError("server_hostname can only be specified " "in client mode") if self._context.check_hostname and not server_hostname: - if HAS_SNI: - raise ValueError("check_hostname requires server_hostname") - else: - raise ValueError("check_hostname requires server_hostname, " - "but it's not supported by your OpenSSL " - "library") + raise ValueError("check_hostname requires server_hostname") self.server_side = server_side self.server_hostname = server_hostname self.do_handshake_on_connect = do_handshake_on_connect |