openstack/deb-python-oauth2client
Code Issues Proposed changes

Change user-agent to follow library version.

Browse Source 
Reviewed in https://codereview.appspot.com/8434043/.
This commit is contained in:
Joe Gregorio
2013-04-05 16:25:11 -04:00
parent 562c9ba599
commit a314b1f01b
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apiclient/model.py
View File

@@ -27,6 +27,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
import logging import logging
import urllib import urllib
from apiclient import __version__
from errors import HttpError from errors import HttpError
from oauth2client.anyjson import simplejson from oauth2client.anyjson import simplejson
@@ -140,7 +141,7 @@ class BaseModel(Model):
headers['user-agent'] += ' ' headers['user-agent'] += ' '
else: else:
headers['user-agent'] = '' headers['user-agent'] = ''
headers['user-agent'] += 'google-api-python-client/1.0' headers['user-agent'] += 'google-api-python-client/' + __version__
if body_value is not None: if body_value is not None:
headers['content-type'] = self.content_type headers['content-type'] = self.content_type

22
tests/test_json_model.py
View File

@@ -27,6 +27,7 @@ import unittest
import httplib2 import httplib2
import apiclient.model import apiclient.model
from apiclient import __version__
from apiclient.errors import HttpError from apiclient.errors import HttpError
from apiclient.model import JsonModel from apiclient.model import JsonModel
from oauth2client.anyjson import simplejson from oauth2client.anyjson import simplejson
@@ -47,7 +48,8 @@ class Model(unittest.TestCase):
query_params = {} query_params = {}
body = None body = None
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['accept'], 'application/json')
self.assertTrue('content-type' not in headers) self.assertTrue('content-type' not in headers)
@@ -62,7 +64,8 @@ class Model(unittest.TestCase):
query_params = {} query_params = {}
body = {} body = {}
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['accept'], 'application/json')
self.assertEqual(headers['content-type'], 'application/json') self.assertEqual(headers['content-type'], 'application/json')
@@ -77,7 +80,8 @@ class Model(unittest.TestCase):
query_params = {} query_params = {}
body = {} body = {}
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['accept'], 'application/json')
self.assertEqual(headers['content-type'], 'application/json') self.assertEqual(headers['content-type'], 'application/json')
@@ -93,7 +97,8 @@ class Model(unittest.TestCase):
query_params = {} query_params = {}
body = {'data': 'foo'} body = {'data': 'foo'}
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['accept'], 'application/json')
self.assertEqual(headers['content-type'], 'application/json') self.assertEqual(headers['content-type'], 'application/json')
@@ -110,7 +115,8 @@ class Model(unittest.TestCase):
'qux': []} 'qux': []}
body = {} body = {}
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['accept'], 'application/json') self.assertEqual(headers['accept'], 'application/json')
self.assertEqual(headers['content-type'], 'application/json') self.assertEqual(headers['content-type'], 'application/json')
@@ -130,9 +136,11 @@ class Model(unittest.TestCase):
query_params = {} query_params = {}
body = {} body = {}
headers, params, query, body = model.request(headers, path_params, query_params, body) headers, params, query, body = model.request(
headers, path_params, query_params, body)
self.assertEqual(headers['user-agent'], 'my-test-app/1.23.4 google-api-python-client/1.0') self.assertEqual(headers['user-agent'],
'my-test-app/1.23.4 google-api-python-client/' + __version__)
def test_bad_response(self): def test_bad_response(self):
model = JsonModel(data_wrapper=False) model = JsonModel(data_wrapper=False)