diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:07:20 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:07:20 +1200 |
| commit | 4152b14387e1fd59f388f695ac468be2a888caa2 (patch) | |
| tree | 833fe7698ac291c892ee06cdf621035c17447764 /netlib/tcp.py | |
| parent | 5bb7159edd7bf1d54b75969a2d3859e9570e8361 (diff) | |
| parent | a652e050b759ca27aa3b794b8e11009853edef34 (diff) | |
| download | mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.tar.gz mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.tar.bz2 mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.zip | |
Merge pull request #71 from Kriechi/landscape
fix warnings and code smells
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index cafc3ed9..a1d1fe62 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -292,7 +292,7 @@ def close_socket(sock): """ try: # We already indicate that we close our end. - # may raise "Transport endpoint is not connected" on Linux + # may raise "Transport endpoint is not connected" on Linux sock.shutdown(socket.SHUT_WR) # Section 4.2.2.13 of RFC 1122 tells us that a close() with any pending @@ -363,10 +363,6 @@ class _Connection(object): except SSL.Error: pass - """ - Creates an SSL Context. - """ - def _create_ssl_context(self, method=SSLv23_METHOD, options=(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_CIPHER_SERVER_PREFERENCE | SSL.OP_NO_COMPRESSION), @@ -378,6 +374,8 @@ class _Connection(object): alpn_select=None, ): """ + Creates an SSL Context. + :param method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, TLSv1_METHOD, TLSv1_1_METHOD, or TLSv1_2_METHOD :param options: A bit field consisting of OpenSSL.SSL.OP_* values :param verify_options: A bit field consisting of OpenSSL.SSL.VERIFY_* values |