git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23e95e6
)
fix potential TypeError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 8 Aug 2011 18:25:33 +0000
(14:25 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 8 Aug 2011 18:25:33 +0000
(14:25 -0400)
sfa/util/httpsProtocol.py
patch
|
blob
|
history
diff --git
a/sfa/util/httpsProtocol.py
b/sfa/util/httpsProtocol.py
index
2b44c10
..
e6c6be1
100644
(file)
--- a/
sfa/util/httpsProtocol.py
+++ b/
sfa/util/httpsProtocol.py
@@
-13,7
+13,9
@@
class HTTPSConnection(httplib.HTTPSConnection):
def __init__(self, host, port=None, key_file=None, cert_file=None,
strict=None, timeout = None):
httplib.HTTPSConnection.__init__(self, host, port, key_file, cert_file, strict)
- self.timeout = float(timeout)
+ if timeout:
+ timeout = float(timeout)
+ self.timeout = timeout
def connect(self):
"""Connect to a host on a given (SSL) port."""