lazr.restfulclient

Merge lp://staging/~barry/lazr.restfulclient/bug-797281 into lp://staging/lazr.restfulclient

bug-797281
Merge into trunk

Proposed by Barry Warsaw on 2011-06-16

Status:

Merged

Merged at revision:

116

Proposed branch:

lp://staging/~barry/lazr.restfulclient/bug-797281

Merge into:

lp://staging/lazr.restfulclient

Diff against target:

15 lines (+4/-1)

1 file modified

src/lazr/restfulclient/_browser.py (+4/-1)

To merge this branch:

bzr merge lp://staging/~barry/lazr.restfulclient/bug-797281

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
j.c.sackett (community)		2011-06-16	Approve on 2011-06-16
Review via email: mp+64894@code.staging.launchpad.net

Description of the change

This works around LP: #797281 which is required in Oneiric. httplib2 0.7.0 added a feature to do SSL certificate validation, enabled by default, but lazr.restfulclient can't handle this. The workaround allows people to continue working with the same validation they had before (i.e. none ;). I'll file a new feature bug to support the cert validation.

Revision history for this message

j.c.sackett (jcsackett) wrote on 2011-06-16:

Barry--

Looks fine, thanks.

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py 2010-07-19 14:15:11 +0000
+++ src/lazr/restfulclient/_browser.py 2011-06-16 20:11:13 +0000
@@ -106,7 +106,10 @@

     def __init__(self, authorizer=None, cache=None, timeout=None,
                  proxy_info=None):
+ # XXX: Barry Warsaw 2011-06-16 bug=797281 ssl_certification
+ # must be disabled for lazr.restfulclient.
         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)

review: Approve

Revision history for this message

Barry Warsaw (barry) wrote on 2011-06-17:

Thanks. I don't believe I have permission to push this change.

Revision history for this message

Robert Collins (lifeless) wrote on 2011-06-17:

On Fri, Jun 17, 2011 at 2:07 PM, Barry Warsaw <email address hidden> wrote:
> Thanks. I don't believe I have permission to push this change.

Have you tried?

Revision history for this message

Barry Warsaw (barry) wrote on 2011-06-17:

On Jun 17, 2011, at 08:48 AM, Robert Collins wrote:

>On Fri, Jun 17, 2011 at 2:07 PM, Barry Warsaw <email address hidden> wrote:
>> Thanks. I don't believe I have permission to push this change.
>
>Have you tried?

I'm sure I'm doing something stupid, but:

@limelight[~/projects/lazr/lazr.restfulclient:1000]% bzr info
Repository tree (format: unnamed)
Location:
shared repository: /home/barry/projects/lazr
repository branch: .

Related branches:
    push branch: bzr+ssh://bazaar.launchpad.net/~lazr-developers/lazr.restfulclient/trunk/
  parent branch: bzr+ssh://bazaar.launchpad.net/~lazr-developers/lazr.restfulclient/trunk/
  submit branch: /home/barry/projects/lazr/bug-797281
@limelight[~/projects/lazr/lazr.restfulclient:1001]% bzr push :parent
bzr: ERROR: Cannot lock LockDir(lp-88074064:///~lazr-developers/lazr.restfulclient/trunk/.bzr/branchlock): Transport operation not possible: readonly transport