Author: tmckay
Date: 2011-10-12 16:15:55 +0000 (Wed, 12 Oct 2011)
New Revision: 5059
Modified:
branches/lucidity/sage/python/sage/verifiedhttps_m2crypto.py
Log:
Merge 5058 from trunk.
svn merge -c 5058
svn+ssh://svn.fedorahosted.org/svn/cumin/trunk
Fix typo.
Modified: branches/lucidity/sage/python/sage/verifiedhttps_m2crypto.py
===================================================================
--- branches/lucidity/sage/python/sage/verifiedhttps_m2crypto.py 2011-10-12 16:12:53 UTC
(rev 5058)
+++ branches/lucidity/sage/python/sage/verifiedhttps_m2crypto.py 2011-10-12 16:15:55 UTC
(rev 5059)
@@ -45,7 +45,7 @@
# this prior to the connection.
httpslib.HTTPSConnection.connect(self)
if self.timeout is not None:
- self.sock.settimeout(timeout)
+ self.sock.settimeout(self.timeout)
except SSL.Checker.WrongHost, e:
# Allow the host name check to fail if domain_verify is off.
# This is mostly for testing with self-signed certificates