Merge branch 'master' into dpebot-repositorygardener

Author: engelke

appengine/standard/endpoints/multiapi/main.py

@@ -34,7 +34,7 @@ class Response(messages.Message):
 @api_collection.api_class(resource_name='shelves')
 class Shelves(remote.Service):
 
-    @endpoints.method(Request, Response, path='list')
+    @endpoints.method(Request, Response)
     def list(self, request):
         return Response()
 
@@ -44,7 +44,11 @@ def list(self, request):
 class Books(remote.Service):
 
     @endpoints.method(Request, Response, path='bookmark')
-    def bookmark(self, request):
+    def get_bookmark(self, request):
+        return Response()
+
+    @endpoints.method(Request, Response)
+    def best_sellers_list(self, request):
         return Response()
 # [END books]
 # [END multiclass]

testing/requirements.txt

@@ -15,3 +15,4 @@ google-api-python-client==1.7.8
 google-cloud-core==0.29.1
 gcp-devrel-py-tools==0.0.15
 flask==1.0.2
+websocket-client==0.54.0