lazr.restfulclient

Merge lp://staging/~xnox/lazr.restfulclient/fixes into lp://staging/lazr.restfulclient

  1. fixes
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 137
Proposed branch: lp://staging/~xnox/lazr.restfulclient/fixes
Merge into: lp://staging/lazr.restfulclient
Diff against target: 743 lines (+84/-310)
9 files modified
buildout.cfg (+1/-1)
ez_setup.py (+0/-241)
setup.py (+6/-7)
src/lazr/restfulclient/_browser.py (+14/-23)
src/lazr/restfulclient/authorize/oauth.py (+2/-1)
src/lazr/restfulclient/resource.py (+22/-12)
src/lazr/restfulclient/tests/test_atomicfilecache.py (+29/-15)
src/lazr/restfulclient/tests/test_error.py (+2/-2)
src/lazr/restfulclient/tests/test_oauth.py (+8/-8)
To merge this branch: bzr merge lp://staging/~xnox/lazr.restfulclient/fixes
Reviewer Review Type Date Requested Status
Barry Warsaw Needs Information
LAZR Developers Pending
Review via email: mp+224945@code.staging.launchpad.net

Commit message

Simplify setup.py and fix one python3 syntax error.

To post a comment you must log in.
lp://staging/~xnox/lazr.restfulclient/fixes updated
139. By Dimitri John Ledkov

SSLHandshakeError is gone in python3, add compat.

140. By Dimitri John Ledkov

Resurect bootstrap.py

141. By Dimitri John Ledkov

Depreciation warning readfp -> read_file

142. By Dimitri John Ledkov

Take 1 at unicode

143. By Dimitri John Ledkov

More stuff

144. By Dimitri John Ledkov

Distch six

145. By Dimitri John Ledkov

Fix standalone buildout

146. By Dimitri John Ledkov

drop unused things

147. By Dimitri John Ledkov

Revert to minimise diff

148. By Dimitri John Ledkov

url must be string

149. By Dimitri John Ledkov

More crap

Revision history for this message
Barry Warsaw (barry) wrote :

A few minor comments and one important question. (inline of course)

review: Needs Information
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Replied.

Revision history for this message
Barry Warsaw (barry) wrote :

On Jul 14, 2014, at 10:20 PM, Dimitri John Ledkov wrote:

>> try:
>> + from httplib2 import SSLHandshakeError
>> +except ImportError:
>> + from httplib2 import HttpLib2Error as SSLHandshakeError
>> +try:
>
>yes, it does. But it's only used to catch the error, and re-raise it with a
>helpful message that "there is an option to ignore ssl certificate
>errors". The actual class of the error has changed, but i believe the text of
>the error comes from the underlying library. This keeps compat in python2,
>and the worst case scenario the error is re-raised regardless.

So I had a look at the actual code where this is used. Ug.

>Maybe I should remove all error catching and thus not use either
>SSLHandshakeError nor HttpLib2Error?

That does seem better. Then release notes or documentation can describe
LP_DISABLE_SSL_CERTIFICATE_VALIDATION.

lp://staging/~xnox/lazr.restfulclient/fixes updated
150. By Dimitri John Ledkov

Whitespace and review fixes, drop SSLHandshakeError handling.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches