Sync httplib2. Fix user-agent code so base libraries are listed after higher level apps/libraries user-agent.
diff --git a/apiclient/oauth.py b/apiclient/oauth.py
index de20336..9907c46 100644
--- a/apiclient/oauth.py
+++ b/apiclient/oauth.py
@@ -131,10 +131,9 @@
headers = {}
headers.update(req.to_header())
if 'user-agent' in headers:
- headers['user-agent'] += ' '
+ headers['user-agent'] = self.user_agent + ' ' + headers['user-agent']
else:
- headers['user-agent'] = ''
- headers['user-agent'] += self.user_agent
+ headers['user-agent'] = self.user_agent
return request_orig(uri, method, body, headers,
redirections, connection_type)