ed00m
diff --git a/‎endpoints/bookstore-grpc/README.md
+2-2 b/‎endpoints/bookstore-grpc/README.md
+2-2
diff --git a/‎endpoints/bookstore-grpc/bookstore.py
+4-2 b/‎endpoints/bookstore-grpc/bookstore.py
+4-2
diff --git a/‎endpoints/bookstore-grpc/bookstore_client.py
+2-3 b/‎endpoints/bookstore-grpc/bookstore_client.py
+2-3
@@ -55,8 +55,8 @@ gRPC libraries and tools are installed, run:
         --include_imports \
         --include_source_info \
         --proto_path=. \
-        --python_out=generated_pb2 \
-        --grpc_python_out=generated_pb2 \
+        --python_out=. \
+        --grpc_python_out=. \
         --descriptor_set_out=api_descriptor.pb \
         bookstore.proto
 
 
@@ -14,6 +14,8 @@
 
 import threading
 
+import six
+
 
 class ShelfInfo(object):
     """The contents of a single shelf."""
@@ -33,7 +35,7 @@ def __init__(self):
 
     def list_shelf(self):
         with self._lock:
-            return [s._shelf for (_, s) in self._shelves.iteritems()]
+            return [s._shelf for (_, s) in six.iteritems(self._shelves)]
 
     def create_shelf(self, shelf):
         with self._lock:
@@ -54,7 +56,7 @@ def delete_shelf(self, shelf_id):
     def list_books(self, shelf_id):
         with self._lock:
             return [book for (
-                _, book) in self._shelves[shelf_id]._books.iteritems()]
+                _, book) in six.iteritems(self._shelves[shelf_id]._books)]
 
     def create_book(self, shelf_id, book):
         with self._lock:
 
@@ -17,18 +17,17 @@
 import argparse
 
 from google.protobuf import empty_pb2
-
 import grpc
 
-from generated_pb2 import bookstore_pb2
+import bookstore_pb2_grpc
 
 
 def run(host, port, api_key, auth_token, timeout):
     """Makes a basic ListShelves call against a gRPC Bookstore server."""
 
     channel = grpc.insecure_channel('{}:{}'.format(host, port))
 
-    stub = bookstore_pb2.BookstoreStub(channel)
+    stub = bookstore_pb2_grpc.BookstoreStub(channel)
     metadata = []
     if api_key:
         metadata.append(('x-api-key', api_key))