commit c3697ad289dc011692591246e8d6d341f37da298
author Alex Gaynor <alex.gaynor@gmail.com> Mon Nov 20 08:19:32 2017 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Mon Nov 20 21:19:32 2017 +0800
tree 4934d3daab2e7d9eb80af4528ceac6520a107666
parent fe0120f9fbf08ca937cc95cf409c0d888145fafa

fix errors with latest flake8 (#710)

* fix errors with latest flake8

* Also fix the macOS builds

* fix?

* allow urllib3 to fail for now

src/OpenSSL/SSL.py

diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 75d080a..667131b 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -307,10 +307,10 @@
                 instr = _ffi.buffer(in_, inlen)[:]
                 protolist = []
                 while instr:
-                    l = indexbytes(instr, 0)
-                    proto = instr[1:l + 1]
+                    length = indexbytes(instr, 0)
+                    proto = instr[1:length + 1]
                     protolist.append(proto)
-                    instr = instr[l + 1:]
+                    instr = instr[length + 1:]
 
                 # Call the callback
                 outstr = callback(conn, protolist)
@@ -1080,7 +1080,7 @@
                 if not push_result:
                     _lib.X509_NAME_free(copy)
                     _raise_current_error()
-        except:
+        except Exception:
             _lib.sk_X509_NAME_free(name_stack)
             raise