piston-mini-client

Merge lp://staging/~mvo/piston-mini-client/proxy_type_http_no_tunnel into lp://staging/piston-mini-client

proxy_type_http_no_tunnel
Merge into trunk

Proposed by Michael Vogt on 2011-10-04

Status:

Merged

Merged at revision:

Proposed branch:

lp://staging/~mvo/piston-mini-client/proxy_type_http_no_tunnel

Merge into:

lp://staging/piston-mini-client

Diff against target:

170 lines (+82/-10)

3 files modified

piston_mini_client/__init__.py (+17/-6)
piston_mini_client/socks.py (+59/-4)
piston_mini_client/tests/test_proxy.py (+6/-0)

To merge this branch:

bzr merge lp://staging/~mvo/piston-mini-client/proxy_type_http_no_tunnel

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Anthony Lenton		2011-10-04	Approve on 2011-10-04
Review via email: mp+78094@code.staging.launchpad.net

Description of the change

This adds support for a new type of http proxy that is sufficient for plain http tunneling to the internals version of socks.py. It will also patch httplib2 to use the internal version of socks.py over the one bundled with httplib2 that has no support for this. See http://code.google.com/p/httplib2/issues/detail?id=38 for some more details

lp://staging/~mvo/piston-mini-client/proxy_type_http_no_tunnel updated on 2011-10-04

53. By Michael Vogt on 2011-10-04: piston_mini_client/__init__.py: always import httplib2 first
54. By Michael Vogt on 2011-10-04: use logging.warn() instead of print