From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 8 Aug 2011 18:25:33 +0000 (-0400)
Subject: fix potential TypeError
X-Git-Tag: sfa-1.0-30~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f93646ec885d962e3e6845084fc2658433eef068;p=sfa.git

fix potential TypeError
---

diff --git a/sfa/util/httpsProtocol.py b/sfa/util/httpsProtocol.py
index 2b44c109..e6c6be1b 100644
--- 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."""