Cleaning up 2.7 compatibility and more work on installer.
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index df01aa0..6ba0208 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -48,7 +48,8 @@
DEFAULT_METHOD_DOC = 'A description of how to use this function'
# Query parameters that work, but don't appear in discovery
-STACK_QUERY_PARAMETERS = ['trace', 'fields', 'pp', 'prettyPrint', 'userIp', 'strict']
+STACK_QUERY_PARAMETERS = ['trace', 'fields', 'pp', 'prettyPrint', 'userIp',
+ 'strict']
def key2param(key):
diff --git a/apiclient/http.py b/apiclient/http.py
index 138ce48..8c81ad4 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -299,9 +299,9 @@
if headers is None:
headers = {}
if method == 'PATCH':
- if 'authorization' in headers and 'oauth_token' in headers['authorization']:
+ if 'oauth_token' in headers.get('authorization', ''):
logging.warning(
- 'OAuth 1.0 request made with Credentials applied after tunnel_patch.')
+ 'OAuth 1.0 request made with Credentials after tunnel_patch.')
headers['x-http-method-override'] = "PATCH"
method = 'POST'
resp, content = request_orig(uri, method, body, headers,