From a1190c369648438811daae70c1baff4e32b198fd Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 15 Feb 2016 17:06:32 +0100 Subject: adjust travis --- netlib/.coveragerc | 11 ----------- netlib/netlib/tcp.py | 5 ++++- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 netlib/.coveragerc (limited to 'netlib') diff --git a/netlib/.coveragerc b/netlib/.coveragerc deleted file mode 100644 index ccbebf8c..00000000 --- a/netlib/.coveragerc +++ /dev/null @@ -1,11 +0,0 @@ -[run] -branch = True - -[report] -show_missing = True -include = *netlib/netlib* -exclude_lines = - pragma: nocover - pragma: no cover - raise NotImplementedError() -omit = *contrib* diff --git a/netlib/netlib/tcp.py b/netlib/netlib/tcp.py index c8548aea..61b41cdc 100644 --- a/netlib/netlib/tcp.py +++ b/netlib/netlib/tcp.py @@ -31,7 +31,10 @@ else: socket_fileobject = socket.SocketIO EINTR = 4 -HAS_ALPN = OpenSSL._util.lib.Cryptography_HAS_ALPN +if os.environ.get("NO_ALPN"): + HAS_ALPN = False +else: + HAS_ALPN = OpenSSL._util.lib.Cryptography_HAS_ALPN # To enable all SSL methods use: SSLv23 # then add options to disable certain methods -- cgit v1.2.3