openstack/deb-python-oauth2client
Code Issues Proposed changes

Fix handling of nextPageToken. Reviewed in http://codereview.appspot.com/4932041/

Browse Source
This commit is contained in:
Joe Gregorio
2011-08-19 14:56:07 -04:00
parent 4bd78e242f
commit 555f33cb1a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apiclient/discovery.py
View File

@@ -616,7 +616,8 @@ def createResource(http, baseUrl, model, requestBuilder,
responseSchema = methodDesc['response'] responseSchema = methodDesc['response']
if '$ref' in responseSchema: if '$ref' in responseSchema:
responseSchema = schema[responseSchema['$ref']] responseSchema = schema[responseSchema['$ref']]
hasNextPageToken = 'nextPageToken' in responseSchema['properties'] hasNextPageToken = 'nextPageToken' in responseSchema.get('properties',
{})
hasPageToken = 'pageToken' in methodDesc.get('parameters', {}) hasPageToken = 'pageToken' in methodDesc.get('parameters', {})
if hasNextPageToken and hasPageToken: if hasNextPageToken and hasPageToken:
createNextMethod(Resource, methodName + '_next', createNextMethod(Resource, methodName + '_next',

4
tests/test_discovery.py
View File

@@ -299,6 +299,10 @@ class Next(unittest.TestCase):
q = parse_qs(parsed[4]) q = parse_qs(parsed[4])
self.assertEqual(q['pageToken'][0], '123abc') self.assertEqual(q['pageToken'][0], '123abc')
def test_next_with_method_with_no_properties(self):
self.http = HttpMock(datafile('latitude.json'), {'status': '200'})
service = build('latitude', 'v1', self.http)
request = service.currentLocation().get()
class DeveloperKey(unittest.TestCase): class DeveloperKey(unittest.TestCase):
def test_param(self): def test_param(self):