Merge pull request #20 from kouk/longint

Add support for file descriptors represented as `long` on Python 2.x.  This fixes many failing tests on 64 bit Windows w/ 64 bit Python.

Also some other changes to make `memdbg` optional (it is pretty glibc-specific).

1 files changed, 4 insertions, 5 deletions

diff --git a/OpenSSL/SSL.py b/OpenSSL/SSL.py
index 811c4de..81ec2e2 100644
--- a/OpenSSL/SSL.py
+++ b/OpenSSL/SSL.py
@@ -5,7 +5,7 @@ from weakref import WeakValueDictionary
 from errno import errorcode
 
 from six import text_type as _text_type
-
+from six import integer_types as integer_types
 
 from OpenSSL._util import (
     ffi as _ffi,
@@ -196,16 +196,15 @@ class _VerifyHelper(object):
 
 def _asFileDescriptor(obj):
     fd = None
-
-    if not isinstance(obj, int):
+    if not isinstance(obj, integer_types):
         meth = getattr(obj, "fileno", None)
         if meth is not None:
             obj = meth()
 
-    if isinstance(obj, int):
+    if isinstance(obj, integer_types):
         fd = obj
 
-    if not isinstance(fd, int):
+    if not isinstance(fd, integer_types):
         raise TypeError("argument must be an int, or have a fileno() method.")
     elif fd < 0:
         raise ValueError(