Merge lp://staging/~elachuni/piston-mini-client/fix-socks-import into lp://staging/piston-mini-client
Proposed by
Anthony Lenton
| Status: | Merged |
|---|---|
| Approved by: | Anthony Lenton |
| Approved revision: | 45 |
| Merged at revision: | 44 |
| Proposed branch: | lp://staging/~elachuni/piston-mini-client/fix-socks-import |
| Merge into: | lp://staging/piston-mini-client |
| Diff against target: |
426 lines (+397/-2) 3 files modified
doc/envvars.rst (+7/-1) piston_mini_client/__init__.py (+5/-1) piston_mini_client/socks.py (+385/-0) |
| To merge this branch: | bzr merge lp://staging/~elachuni/piston-mini-client/fix-socks-import |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Made all tests pass in a virtualenv by including a local copy of socks.py and conditionally importing it if it's not available from httplib2.
The plan is to *not* package the local copy of socks.py, so that the one that's already packaged up as part of httplib2 is found on Oneiric.
Otoh, httplib2 *doesn't* include socks.py in natty, should we include the local copy in the Natty package? SocksiPy is available in Natty, but in Universe.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for this update, I think its the right approach to first try httplib2 and then our own copy.