summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantinos Koukopoulos <koukopoulos@gmail.com>2014-01-27 10:27:51 -0800
committerKonstantinos Koukopoulos <koukopoulos@gmail.com>2014-01-27 10:27:51 -0800
commitd3d41b0bc03170c47d66b7b921c51f3779c609ea (patch)
tree0ab15d7c5a9f71de3318f08156e515aeb1c79fcb
parentdf454990b0c25a7a39d717328f384eb71128aba3 (diff)
downloadpyopenssl-d3d41b0bc03170c47d66b7b921c51f3779c609ea.tar.gz
support 64 bit fd's
-rw-r--r--OpenSSL/SSL.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSSL/SSL.py b/OpenSSL/SSL.py
index ce2cc29..3a0d751 100644
--- a/OpenSSL/SSL.py
+++ b/OpenSSL/SSL.py
@@ -196,16 +196,15 @@ class _VerifyHelper(object):
def _asFileDescriptor(obj):
fd = None
-
- if not isinstance(obj, int):
+ if not isinstance(obj, (int, long)):
meth = getattr(obj, "fileno", None)
if meth is not None:
obj = meth()
- if isinstance(obj, int):
+ if isinstance(obj, (int, long)):
fd = obj
- if not isinstance(fd, int):
+ if not isinstance(fd, (int, long)):
raise TypeError("argument must be an int, or have a fileno() method.")
elif fd < 0:
raise ValueError(