Merge lp://qastaging/~smoser/simplestreams/custom-user-agent into lp://qastaging/~danilo/simplestreams/custom-user-agent

Proposed by Scott Moser
Status: Merged
Merged at revision: 430
Proposed branch: lp://qastaging/~smoser/simplestreams/custom-user-agent
Merge into: lp://qastaging/~danilo/simplestreams/custom-user-agent
Diff against target: 85 lines (+34/-9)
3 files modified
simplestreams/contentsource.py (+2/-0)
tests/httpserver.py (+30/-8)
tests/unittests/test_contentsource.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~smoser/simplestreams/custom-user-agent
Reviewer Review Type Date Requested Status
Данило Шеган Approve
Review via email: mp+292538@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Thanks again for these fixes.

I've double checked, and Requests.__init__() does the following:

        headers = {} if headers is None else headers

so that change is not strictly necessary: None is exactly equivalent to passing in {}. I've still merged it in, since there's no harm either.

Merged all the proposed changes as well.

review: Approve

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