Skip to content

fix: don't set http.redirect_codes if the attr doesn't exist #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
busunkim96 merged 7 commits into from
Mar 13, 2020
Merged

fix: don't set http.redirect_codes if the attr doesn't exist #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc43157
fix: don't set http.redirect_codes if the attr doesn't exist
busunkim96 Mar 12, 2020
7f81753
Merge branch 'master' into skip-redirect-code
busunkim96 Mar 12, 2020
6318b7d
fix: widen permitted httplib2 versions
busunkim96 Mar 12, 2020
0ed8845
docs: add note to setup.py about version range
busunkim96 Mar 13, 2020
5e397c3
docs: fix typo
busunkim96 Mar 13, 2020
56c21bd
docs: make more similar to other comment
busunkim96 Mar 13, 2020
f9b3796
docs: more typo fixes :D
busunkim96 Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion googleapiclient/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,13 @@ def build_http():
# for Resumable Uploads rather than Permanent Redirects.
# This asks httplib2 to exclude 308s from the status codes
# it treats as redirects
http.redirect_codes = http.redirect_codes - {308}
try:
http.redirect_codes = http.redirect_codes - {308}
except AttributeError:
# Apache Beam tests depend on this library and cannot
# currently upgrade their httplib2 version
# http.redirect_codes does not exist in previous versions
# of httplib2, so pass
pass

return http
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
packages = ["apiclient", "googleapiclient", "googleapiclient/discovery_cache"]

install_requires = [
"httplib2>=0.17.0,<1dev",
# NOTE: Apache Beam tests depend on this library and cannot
# currently upgrade their httplib2 version.
# Please see https://github.com/googleapis/google-api-python-client/pull/841
"httplib2>=0.9.2,<1dev",
"google-auth>=1.4.1",
"google-auth-httplib2>=0.0.3",
"google-api-core>=1.13.0,<2dev",
Expand Down