Merge lp://staging/~mterry/ubuntuone-couch/extra-headers into lp://staging/ubuntuone-couch

Looks good, except this is a bad idea:

+ token_secret=None, headers={}):

As default values in Python should as a rule not be mutable types. Default values are evaluated at import time, making this empty dictionary a 'global' variable, so that in this case the oauth headers for one call to request() will pollute the dictionary for any subsequent calls.

Please change it to:

+ token_secret=None, headers=None):

and then at the beginning of the function implementation do:

headers = headers or {}

Also a test case would be awesome, but if you cannot think of one, I can look at that.

OK, updated to use your None method.

Could you please look at a test? I looked briefly and would copy the test_request_plaintext method and just add a test header like "Foo": "Bar", but I wasn't sure how to test whether the outgoing request was what I expected.

Looks great now, I'll think of a test and add it in a separate branch.