Merge lp:~dobey/ubuntuone-client/httplib-jaunty into lp:ubuntuone-client

[dobey]

Use a try/except to handle Jaunty which lacks _tunnel_host in httplib

[Rick McBride (rmcbride)]

I like it.

review: Approve

[Philip Fibiger (pfibiger)]

nice. better than abandoning jaunty two weeks before karmic release :)

review: Approve

=== modified file 'ubuntuone/oauthdesktop/auth.py'
--- ubuntuone/oauthdesktop/auth.py	2009-10-08 18:57:48 +0000
+++ ubuntuone/oauthdesktop/auth.py	2009-10-16 19:05:20 +0000
@@ -55,9 +55,12 @@
 def _connect_wrapper(self):
     """Override HTTPSConnection.connect to require certificate checks"""
     sock = socket.create_connection((self.host, self.port), self.timeout)
-    if self._tunnel_host:
-        self.sock = sock
-        self._tunnel()
+    try:
+        if self._tunnel_host:
+            self.sock = sock
+            self._tunnel()
+    except AttributeError:
+        pass
     self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
         cert_reqs=ssl.CERT_REQUIRED, 
         ca_certs="/etc/ssl/certs/ca-certificates.crt")