Regenerate example Python generated code

4 files changed, 77 insertions, 384 deletions

diff --git a/examples/python/helloworld/helloworld_pb2.py b/examples/python/helloworld/helloworld_pb2.py
index 6665b1f687..e18ab9acc7 100644
--- a/examples/python/helloworld/helloworld_pb2.py
+++ b/examples/python/helloworld/helloworld_pb2.py
@@ -21,7 +21,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   syntax='proto3',
   serialized_pb=_b('\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2I\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x42\x36\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\xa2\x02\x03HLWb\x06proto3')
 )
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 
 
@@ -89,6 +88,7 @@ _HELLOREPLY = _descriptor.Descriptor(
 
 DESCRIPTOR.message_types_by_name['HelloRequest'] = _HELLOREQUEST
 DESCRIPTOR.message_types_by_name['HelloReply'] = _HELLOREPLY
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 HelloRequest = _reflection.GeneratedProtocolMessageType('HelloRequest', (_message.Message,), dict(
   DESCRIPTOR = _HELLOREQUEST,
@@ -107,123 +107,28 @@ _sym_db.RegisterMessage(HelloReply)
 
 DESCRIPTOR.has_options = True
 DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW'))
-try:
-  # THESE ELEMENTS WILL BE DEPRECATED.
-  # Please use the generated *_pb2_grpc.py files instead.
-  import grpc
-  from grpc.framework.common import cardinality
-  from grpc.framework.interfaces.face import utilities as face_utilities
-  from grpc.beta import implementations as beta_implementations
-  from grpc.beta import interfaces as beta_interfaces
-
-
-  class GreeterStub(object):
-    """The greeting service definition.
-    """
-
-    def __init__(self, channel):
-      """Constructor.
-
-      Args:
-        channel: A grpc.Channel.
-      """
-      self.SayHello = channel.unary_unary(
-          '/helloworld.Greeter/SayHello',
-          request_serializer=HelloRequest.SerializeToString,
-          response_deserializer=HelloReply.FromString,
-          )
-
-
-  class GreeterServicer(object):
-    """The greeting service definition.
-    """
-
-    def SayHello(self, request, context):
-      """Sends a greeting
-      """
-      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-      context.set_details('Method not implemented!')
-      raise NotImplementedError('Method not implemented!')
-
-
-  def add_GreeterServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-        'SayHello': grpc.unary_unary_rpc_method_handler(
-            servicer.SayHello,
-            request_deserializer=HelloRequest.FromString,
-            response_serializer=HelloReply.SerializeToString,
-        ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-        'helloworld.Greeter', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
-  class BetaGreeterServicer(object):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This class was generated
-    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
-    """The greeting service definition.
-    """
-    def SayHello(self, request, context):
-      """Sends a greeting
-      """
-      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
-
-
-  class BetaGreeterStub(object):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This class was generated
-    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
-    """The greeting service definition.
-    """
-    def SayHello(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
-      """Sends a greeting
-      """
-      raise NotImplementedError()
-    SayHello.future = None
-
-
-  def beta_create_Greeter_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This function was
-    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
-    request_deserializers = {
-      ('helloworld.Greeter', 'SayHello'): HelloRequest.FromString,
-    }
-    response_serializers = {
-      ('helloworld.Greeter', 'SayHello'): HelloReply.SerializeToString,
-    }
-    method_implementations = {
-      ('helloworld.Greeter', 'SayHello'): face_utilities.unary_unary_inline(servicer.SayHello),
-    }
-    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
-    return beta_implementations.server(method_implementations, options=server_options)
-
-
-  def beta_create_Greeter_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This function was
-    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
-    request_serializers = {
-      ('helloworld.Greeter', 'SayHello'): HelloRequest.SerializeToString,
-    }
-    response_deserializers = {
-      ('helloworld.Greeter', 'SayHello'): HelloReply.FromString,
-    }
-    cardinalities = {
-      'SayHello': cardinality.Cardinality.UNARY_UNARY,
-    }
-    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
-    return beta_implementations.dynamic_stub(channel, 'helloworld.Greeter', cardinalities, options=stub_options)
-except ImportError:
-  pass
+
+_GREETER = _descriptor.ServiceDescriptor(
+  name='Greeter',
+  full_name='helloworld.Greeter',
+  file=DESCRIPTOR,
+  index=0,
+  options=None,
+  serialized_start=93,
+  serialized_end=166,
+  methods=[
+  _descriptor.MethodDescriptor(
+    name='SayHello',
+    full_name='helloworld.Greeter.SayHello',
+    index=0,
+    containing_service=None,
+    input_type=_HELLOREQUEST,
+    output_type=_HELLOREPLY,
+    options=None,
+  ),
+])
+_sym_db.RegisterServiceDescriptor(_GREETER)
+
+DESCRIPTOR.services_by_name['Greeter'] = _GREETER
+
 # @@protoc_insertion_point(module_scope)
diff --git a/examples/python/helloworld/helloworld_pb2_grpc.py b/examples/python/helloworld/helloworld_pb2_grpc.py
index 682dc36cd8..18e07d1679 100644
--- a/examples/python/helloworld/helloworld_pb2_grpc.py
+++ b/examples/python/helloworld/helloworld_pb2_grpc.py
@@ -1,6 +1,5 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
 import helloworld_pb2 as helloworld__pb2
 
diff --git a/examples/python/route_guide/route_guide_pb2.py b/examples/python/route_guide/route_guide_pb2.py
index e6775eb814..fbbc194a58 100644
--- a/examples/python/route_guide/route_guide_pb2.py
+++ b/examples/python/route_guide/route_guide_pb2.py
@@ -21,7 +21,6 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   syntax='proto3',
   serialized_pb=_b('\n\x11route_guide.proto\x12\nrouteguide\",\n\x05Point\x12\x10\n\x08latitude\x18\x01 \x01(\x05\x12\x11\n\tlongitude\x18\x02 \x01(\x05\"I\n\tRectangle\x12\x1d\n\x02lo\x18\x01 \x01(\x0b\x32\x11.routeguide.Point\x12\x1d\n\x02hi\x18\x02 \x01(\x0b\x32\x11.routeguide.Point\"<\n\x07\x46\x65\x61ture\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08location\x18\x02 \x01(\x0b\x32\x11.routeguide.Point\"A\n\tRouteNote\x12#\n\x08location\x18\x01 \x01(\x0b\x32\x11.routeguide.Point\x12\x0f\n\x07message\x18\x02 \x01(\t\"b\n\x0cRouteSummary\x12\x13\n\x0bpoint_count\x18\x01 \x01(\x05\x12\x15\n\rfeature_count\x18\x02 \x01(\x05\x12\x10\n\x08\x64istance\x18\x03 \x01(\x05\x12\x14\n\x0c\x65lapsed_time\x18\x04 \x01(\x05\x32\x85\x02\n\nRouteGuide\x12\x36\n\nGetFeature\x12\x11.routeguide.Point\x1a\x13.routeguide.Feature\"\x00\x12>\n\x0cListFeatures\x12\x15.routeguide.Rectangle\x1a\x13.routeguide.Feature\"\x00\x30\x01\x12>\n\x0bRecordRoute\x12\x11.routeguide.Point\x1a\x18.routeguide.RouteSummary\"\x00(\x01\x12?\n\tRouteChat\x12\x15.routeguide.RouteNote\x1a\x15.routeguide.RouteNote\"\x00(\x01\x30\x01\x42\x36\n\x1bio.grpc.examples.routeguideB\x0fRouteGuideProtoP\x01\xa2\x02\x03RTGb\x06proto3')
 )
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 
 
@@ -238,6 +237,7 @@ DESCRIPTOR.message_types_by_name['Rectangle'] = _RECTANGLE
 DESCRIPTOR.message_types_by_name['Feature'] = _FEATURE
 DESCRIPTOR.message_types_by_name['RouteNote'] = _ROUTENOTE
 DESCRIPTOR.message_types_by_name['RouteSummary'] = _ROUTESUMMARY
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Point = _reflection.GeneratedProtocolMessageType('Point', (_message.Message,), dict(
   DESCRIPTOR = _POINT,
@@ -277,265 +277,55 @@ _sym_db.RegisterMessage(RouteSummary)
 
 DESCRIPTOR.has_options = True
 DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\033io.grpc.examples.routeguideB\017RouteGuideProtoP\001\242\002\003RTG'))
-try:
-  # THESE ELEMENTS WILL BE DEPRECATED.
-  # Please use the generated *_pb2_grpc.py files instead.
-  import grpc
-  from grpc.framework.common import cardinality
-  from grpc.framework.interfaces.face import utilities as face_utilities
-  from grpc.beta import implementations as beta_implementations
-  from grpc.beta import interfaces as beta_interfaces
-
-
-  class RouteGuideStub(object):
-    """Interface exported by the server.
-    """
-
-    def __init__(self, channel):
-      """Constructor.
-
-      Args:
-        channel: A grpc.Channel.
-      """
-      self.GetFeature = channel.unary_unary(
-          '/routeguide.RouteGuide/GetFeature',
-          request_serializer=Point.SerializeToString,
-          response_deserializer=Feature.FromString,
-          )
-      self.ListFeatures = channel.unary_stream(
-          '/routeguide.RouteGuide/ListFeatures',
-          request_serializer=Rectangle.SerializeToString,
-          response_deserializer=Feature.FromString,
-          )
-      self.RecordRoute = channel.stream_unary(
-          '/routeguide.RouteGuide/RecordRoute',
-          request_serializer=Point.SerializeToString,
-          response_deserializer=RouteSummary.FromString,
-          )
-      self.RouteChat = channel.stream_stream(
-          '/routeguide.RouteGuide/RouteChat',
-          request_serializer=RouteNote.SerializeToString,
-          response_deserializer=RouteNote.FromString,
-          )
-
-
-  class RouteGuideServicer(object):
-    """Interface exported by the server.
-    """
-
-    def GetFeature(self, request, context):
-      """A simple RPC.
-
-      Obtains the feature at a given position.
-
-      A feature with an empty name is returned if there's no feature at the given
-      position.
-      """
-      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-      context.set_details('Method not implemented!')
-      raise NotImplementedError('Method not implemented!')
-
-    def ListFeatures(self, request, context):
-      """A server-to-client streaming RPC.
-
-      Obtains the Features available within the given Rectangle.  Results are
-      streamed rather than returned at once (e.g. in a response message with a
-      repeated field), as the rectangle may cover a large area and contain a
-      huge number of features.
-      """
-      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-      context.set_details('Method not implemented!')
-      raise NotImplementedError('Method not implemented!')
-
-    def RecordRoute(self, request_iterator, context):
-      """A client-to-server streaming RPC.
-
-      Accepts a stream of Points on a route being traversed, returning a
-      RouteSummary when traversal is completed.
-      """
-      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-      context.set_details('Method not implemented!')
-      raise NotImplementedError('Method not implemented!')
-
-    def RouteChat(self, request_iterator, context):
-      """A Bidirectional streaming RPC.
-
-      Accepts a stream of RouteNotes sent while a route is being traversed,
-      while receiving other RouteNotes (e.g. from other users).
-      """
-      context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-      context.set_details('Method not implemented!')
-      raise NotImplementedError('Method not implemented!')
-
-
-  def add_RouteGuideServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-        'GetFeature': grpc.unary_unary_rpc_method_handler(
-            servicer.GetFeature,
-            request_deserializer=Point.FromString,
-            response_serializer=Feature.SerializeToString,
-        ),
-        'ListFeatures': grpc.unary_stream_rpc_method_handler(
-            servicer.ListFeatures,
-            request_deserializer=Rectangle.FromString,
-            response_serializer=Feature.SerializeToString,
-        ),
-        'RecordRoute': grpc.stream_unary_rpc_method_handler(
-            servicer.RecordRoute,
-            request_deserializer=Point.FromString,
-            response_serializer=RouteSummary.SerializeToString,
-        ),
-        'RouteChat': grpc.stream_stream_rpc_method_handler(
-            servicer.RouteChat,
-            request_deserializer=RouteNote.FromString,
-            response_serializer=RouteNote.SerializeToString,
-        ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-        'routeguide.RouteGuide', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
-  class BetaRouteGuideServicer(object):
-    """The Beta API is deprecated for 0.15.0 and later.
 
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This class was generated
-    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
-    """Interface exported by the server.
-    """
-    def GetFeature(self, request, context):
-      """A simple RPC.
-
-      Obtains the feature at a given position.
-
-      A feature with an empty name is returned if there's no feature at the given
-      position.
-      """
-      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
-    def ListFeatures(self, request, context):
-      """A server-to-client streaming RPC.
-
-      Obtains the Features available within the given Rectangle.  Results are
-      streamed rather than returned at once (e.g. in a response message with a
-      repeated field), as the rectangle may cover a large area and contain a
-      huge number of features.
-      """
-      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
-    def RecordRoute(self, request_iterator, context):
-      """A client-to-server streaming RPC.
-
-      Accepts a stream of Points on a route being traversed, returning a
-      RouteSummary when traversal is completed.
-      """
-      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
-    def RouteChat(self, request_iterator, context):
-      """A Bidirectional streaming RPC.
-
-      Accepts a stream of RouteNotes sent while a route is being traversed,
-      while receiving other RouteNotes (e.g. from other users).
-      """
-      context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
-
-
-  class BetaRouteGuideStub(object):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This class was generated
-    only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
-    """Interface exported by the server.
-    """
-    def GetFeature(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
-      """A simple RPC.
-
-      Obtains the feature at a given position.
-
-      A feature with an empty name is returned if there's no feature at the given
-      position.
-      """
-      raise NotImplementedError()
-    GetFeature.future = None
-    def ListFeatures(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
-      """A server-to-client streaming RPC.
-
-      Obtains the Features available within the given Rectangle.  Results are
-      streamed rather than returned at once (e.g. in a response message with a
-      repeated field), as the rectangle may cover a large area and contain a
-      huge number of features.
-      """
-      raise NotImplementedError()
-    def RecordRoute(self, request_iterator, timeout, metadata=None, with_call=False, protocol_options=None):
-      """A client-to-server streaming RPC.
-
-      Accepts a stream of Points on a route being traversed, returning a
-      RouteSummary when traversal is completed.
-      """
-      raise NotImplementedError()
-    RecordRoute.future = None
-    def RouteChat(self, request_iterator, timeout, metadata=None, with_call=False, protocol_options=None):
-      """A Bidirectional streaming RPC.
-
-      Accepts a stream of RouteNotes sent while a route is being traversed,
-      while receiving other RouteNotes (e.g. from other users).
-      """
-      raise NotImplementedError()
-
-
-  def beta_create_RouteGuide_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
-    """The Beta API is deprecated for 0.15.0 and later.
-
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This function was
-    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
-    request_deserializers = {
-      ('routeguide.RouteGuide', 'GetFeature'): Point.FromString,
-      ('routeguide.RouteGuide', 'ListFeatures'): Rectangle.FromString,
-      ('routeguide.RouteGuide', 'RecordRoute'): Point.FromString,
-      ('routeguide.RouteGuide', 'RouteChat'): RouteNote.FromString,
-    }
-    response_serializers = {
-      ('routeguide.RouteGuide', 'GetFeature'): Feature.SerializeToString,
-      ('routeguide.RouteGuide', 'ListFeatures'): Feature.SerializeToString,
-      ('routeguide.RouteGuide', 'RecordRoute'): RouteSummary.SerializeToString,
-      ('routeguide.RouteGuide', 'RouteChat'): RouteNote.SerializeToString,
-    }
-    method_implementations = {
-      ('routeguide.RouteGuide', 'GetFeature'): face_utilities.unary_unary_inline(servicer.GetFeature),
-      ('routeguide.RouteGuide', 'ListFeatures'): face_utilities.unary_stream_inline(servicer.ListFeatures),
-      ('routeguide.RouteGuide', 'RecordRoute'): face_utilities.stream_unary_inline(servicer.RecordRoute),
-      ('routeguide.RouteGuide', 'RouteChat'): face_utilities.stream_stream_inline(servicer.RouteChat),
-    }
-    server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
-    return beta_implementations.server(method_implementations, options=server_options)
-
-
-  def beta_create_RouteGuide_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
-    """The Beta API is deprecated for 0.15.0 and later.
+_ROUTEGUIDE = _descriptor.ServiceDescriptor(
+  name='RouteGuide',
+  full_name='routeguide.RouteGuide',
+  file=DESCRIPTOR,
+  index=0,
+  options=None,
+  serialized_start=384,
+  serialized_end=645,
+  methods=[
+  _descriptor.MethodDescriptor(
+    name='GetFeature',
+    full_name='routeguide.RouteGuide.GetFeature',
+    index=0,
+    containing_service=None,
+    input_type=_POINT,
+    output_type=_FEATURE,
+    options=None,
+  ),
+  _descriptor.MethodDescriptor(
+    name='ListFeatures',
+    full_name='routeguide.RouteGuide.ListFeatures',
+    index=1,
+    containing_service=None,
+    input_type=_RECTANGLE,
+    output_type=_FEATURE,
+    options=None,
+  ),
+  _descriptor.MethodDescriptor(
+    name='RecordRoute',
+    full_name='routeguide.RouteGuide.RecordRoute',
+    index=2,
+    containing_service=None,
+    input_type=_POINT,
+    output_type=_ROUTESUMMARY,
+    options=None,
+  ),
+  _descriptor.MethodDescriptor(
+    name='RouteChat',
+    full_name='routeguide.RouteGuide.RouteChat',
+    index=3,
+    containing_service=None,
+    input_type=_ROUTENOTE,
+    output_type=_ROUTENOTE,
+    options=None,
+  ),
+])
+_sym_db.RegisterServiceDescriptor(_ROUTEGUIDE)
+
+DESCRIPTOR.services_by_name['RouteGuide'] = _ROUTEGUIDE
 
-    It is recommended to use the GA API (classes and functions in this
-    file not marked beta) for all further purposes. This function was
-    generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
-    request_serializers = {
-      ('routeguide.RouteGuide', 'GetFeature'): Point.SerializeToString,
-      ('routeguide.RouteGuide', 'ListFeatures'): Rectangle.SerializeToString,
-      ('routeguide.RouteGuide', 'RecordRoute'): Point.SerializeToString,
-      ('routeguide.RouteGuide', 'RouteChat'): RouteNote.SerializeToString,
-    }
-    response_deserializers = {
-      ('routeguide.RouteGuide', 'GetFeature'): Feature.FromString,
-      ('routeguide.RouteGuide', 'ListFeatures'): Feature.FromString,
-      ('routeguide.RouteGuide', 'RecordRoute'): RouteSummary.FromString,
-      ('routeguide.RouteGuide', 'RouteChat'): RouteNote.FromString,
-    }
-    cardinalities = {
-      'GetFeature': cardinality.Cardinality.UNARY_UNARY,
-      'ListFeatures': cardinality.Cardinality.UNARY_STREAM,
-      'RecordRoute': cardinality.Cardinality.STREAM_UNARY,
-      'RouteChat': cardinality.Cardinality.STREAM_STREAM,
-    }
-    stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
-    return beta_implementations.dynamic_stub(channel, 'routeguide.RouteGuide', cardinalities, options=stub_options)
-except ImportError:
-  pass
 # @@protoc_insertion_point(module_scope)
diff --git a/examples/python/route_guide/route_guide_pb2_grpc.py b/examples/python/route_guide/route_guide_pb2_grpc.py
index 27b24c747d..05c1b79312 100644
--- a/examples/python/route_guide/route_guide_pb2_grpc.py
+++ b/examples/python/route_guide/route_guide_pb2_grpc.py
@@ -1,6 +1,5 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
 import route_guide_pb2 as route__guide__pb2