codeitpro
diff --git a/‎apiclient/discovery.py‎
Lines changed: 9 additions & 9 deletions b/‎apiclient/discovery.py‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎samples/api-python-client-doc/index.html‎
Lines changed: 1 addition & 1 deletion b/‎samples/api-python-client-doc/index.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/api-python-client-doc/main.py‎
Lines changed: 3 additions & 1 deletion b/‎samples/api-python-client-doc/main.py‎
Lines changed: 3 additions & 1 deletion
@@ -43,8 +43,8 @@
 
 URITEMPLATE = re.compile('{[^}]*}')
 VARNAME = re.compile('[a-zA-Z0-9_-]+')
-DISCOVERY_URI = ('https://www.googleapis.com/discovery/v0.3/describe/'
-  '{api}/{apiVersion}')
+DISCOVERY_URI = ('https://www.googleapis.com/discovery/v1/apis/'
+  '{api}/{apiVersion}/rest')
 DEFAULT_METHOD_DOC = 'A description of how to use this function'
 
 # Query parameters that work, but don't appear in discovery
@@ -164,7 +164,7 @@ def build_from_document(
   """
 
   service = simplejson.loads(service)
-  base = urlparse.urljoin(base, service['restBasePath'])
+  base = urlparse.urljoin(base, service['basePath'])
   if future:
     future = simplejson.loads(future)
     auth_discovery = future.get('auth', {})
@@ -232,16 +232,16 @@ def __init__(self):
       self._requestBuilder = requestBuilder
 
   def createMethod(theclass, methodName, methodDesc, futureDesc):
-    pathUrl = methodDesc['restPath']
+    pathUrl = methodDesc['path']
     httpMethod = methodDesc['httpMethod']
-    methodId = methodDesc['rpcMethod']
+    methodId = methodDesc['id']
 
     if 'parameters' not in methodDesc:
       methodDesc['parameters'] = {}
     for name in STACK_QUERY_PARAMETERS:
       methodDesc['parameters'][name] = {
           'type': 'string',
-          'restParameterType': 'query'
+          'location': 'query'
           }
 
     if httpMethod in ['PUT', 'POST', 'PATCH']:
@@ -274,9 +274,9 @@ def createMethod(theclass, methodName, methodDesc, futureDesc):
           required_params.append(param)
         if desc.get('repeated', False):
           repeated_params.append(param)
-        if desc.get('restParameterType') == 'query':
+        if desc.get('location') == 'query':
           query_params.append(param)
-        if desc.get('restParameterType') == 'path':
+        if desc.get('location') == 'path':
           path_params[param] = param
         param_type[param] = desc.get('type', 'string')
 
@@ -380,7 +380,7 @@ def method(self, **kwargs):
     setattr(theclass, methodName, method)
 
   def createNextMethod(theclass, methodName, methodDesc, futureDesc):
-    methodId = methodDesc['rpcMethod'] + '.next'
+    methodId = methodDesc['id'] + '.next'
 
     def methodNext(self, previous):
       """
 
@@ -6,7 +6,7 @@
   <body>
     <h1> Google API Client for Python Documentation </h1>
     {% for item in directory %}
-    <p><a href="/{{ item.name }}/{{ item.version }}"><img src="{{ item.icons.x32 }}"/> {{ item.description }} </a></p>
+    <p><a href="/{{ item.name }}/{{ item.version }}"><img src="{{ item.icons.x32 }}"/> {{ item.title }} </a></p>
     {% endfor %}
   </body>
 </html>
@@ -35,8 +35,10 @@ class MainHandler(webapp.RequestHandler):
 
   def get(self):
     http = httplib2.Http(memcache)
-    resp, content = http.request('https://www.googleapis.com/discovery/v0.3/directory?preferred=true')
+    resp, content = http.request('https://www.googleapis.com/discovery/v1/apis?preferred=true')
     directory = simplejson.loads(content)['items']
+    for item in directory:
+      item['title'] = item.get('title', item.get('description', ''))
     path = os.path.join(os.path.dirname(__file__), 'index.html')
     self.response.out.write(
         template.render(