added optional content_type to bucket.upload_file

[ghost]

No description provided.

[googlebot]

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

---

• If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
• If you signed the CLA as a corporation, please let us know the company's name.

[ghost]

I signed it!

[googlebot]

CLAs look good, thanks!

[dhermes]

Looks fine. Any reason why you don't just use the Blob.upload_* methods?

[ghost]

not particularly, either works

[dhermes]

I think we've even debated making Bucket.upload_file a protected method to just encourage people to use the Blob directly.

---

Can you address the test failure:

TypeError: upload_from_filename() got an unexpected keyword argument 'content_type'

[ghost]

hm.. the test passes for me
I'll look into it tomorrow

[dhermes]

Thanks. You are running the tests locally via tox, yes?

[ghost]

yes, I am also using the code in production

[dhermes]

Notice it's a test fixture _Blob which encounters an unexpected keyword argument 'content_type': https://github.com/GoogleCloudPlatform/gcloud-python/blob/9c4867ab3a26b6f5e19f85c5d66e3c9083a8d83f/gcloud/storage/test_bucket.py#L525-L533