Merge pull request #409 from alex/flake8-cleanup

Fixed up some flake8 errors from the latest version
pyca · Jan 16, 2016 · a85b47e · a85b47e
2 parents b3316fc + d809a58
commit a85b47e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/src/OpenSSL/tsafe.py b/src/OpenSSL/tsafe.py
@@ -1,10 +1,6 @@
-from OpenSSL import SSL
-_ssl = SSL
-del SSL
+from threading import RLock as _RLock
 
-import threading
-_RLock = threading.RLock
-del threading
+from OpenSSL import SSL as _ssl
 
 
 class Connection:

diff --git a/tests/memdbg.py b/tests/memdbg.py
@@ -1,11 +1,14 @@
 import sys
-sys.modules['ssl'] = None
-sys.modules['_hashlib'] = None
-
 
 import traceback
 
 from cffi import api as _api
+
+
+sys.modules['ssl'] = None
+sys.modules['_hashlib'] = None
+
+
 _ffi = _api.FFI()
 _ffi.cdef(
     """

diff --git a/tests/runtests.py b/tests/runtests.py