Merge lp:~ubuntu-branches/ubuntu/oneiric/lazr.restfulclient/oneiric-201106162303 into lp:ubuntu/oneiric/lazr.restfulclient

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/lazr.restfulclient now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/lazr.restfulclient/oneiric-201106162303. A merge should be performed if necessary.

Unmerged revisions

15. By Barry Warsaw on 2011-06-16

httplib2 0.7.0 added SSL certificate validation by default, but
lazr.restfulclient is not prepared to handle this, so disable it for
now. (LP: #797281)

=== added file 'debian/patches/disable_cert_validation.patch'
--- debian/patches/disable_cert_validation.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable_cert_validation.patch	2011-06-16 23:08:27 +0000
@@ -0,0 +1,22 @@
+Description: httplib2 0.7.0 added SSL certificate validation by default, but
+ lazr.restfulclient is not prepared to handle this, so disable it for now.
+Author: Barry Warsaw <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/lazr.restfulclient/+bug/797281
+Forwarded: yes
+
+=== modified file 'src/lazr/restfulclient/_browser.py'
+--- old/src/lazr/restfulclient/_browser.py	2010-12-04 12:53:58 +0000
++++ new/src/lazr/restfulclient/_browser.py	2011-06-16 15:53:43 +0000
+@@ -106,7 +106,10 @@
+ 
+     def __init__(self, authorizer=None, cache=None, timeout=None,
+                  proxy_info=None):
+-        super(RestfulHttp, self).__init__(cache, timeout, proxy_info)
++        super(RestfulHttp, self).__init__(
++            cache, timeout, proxy_info,
++            # LP: #797281
++            disable_ssl_certificate_validation=True)
+         self.authorizer = authorizer
+         if self.authorizer is not None:
+             self.authorizer.authorizeSession(self)
+

=== renamed file 'debian/patches/disable_cert_validation.patch' => 'debian/patches/disable_cert_validation.patch.moved'