Python source reorganization.

A top-level "grpc" package is added and RPC Framework
is made public.

src/python/interop/interop/methods.py

@@ -29,7 +29,7 @@
 
 """Implementations of interoperability test methods."""
 
-from grpc_early_adopter import utilities
+from grpc.early_adopter import utilities
 
 from interop import empty_pb2
 from interop import messages_pb2

src/python/interop/interop/server.py

@@ -34,7 +34,7 @@ import logging
 import pkg_resources
 import time
 
-from grpc_early_adopter import implementations
+from grpc.early_adopter import implementations
 
 from interop import methods
 

src/python/src/grpc/_adapter/_blocking_invocation_inline_service_test.py

@@ -2,8 +2,8 @@
 
 import unittest
 
-from _adapter import _face_test_case
+from grpc._adapter import _face_test_case
-from _framework.face.testing import blocking_invocation_inline_service_test_case as test_case
+from grpc.framework.face.testing import blocking_invocation_inline_service_test_case as test_case
 
 
 class BlockingInvocationInlineServiceTest(

src/python/src/grpc/_adapter/_c.c

@@ -34,11 +34,11 @@
 #include <Python.h>
 #include <grpc/grpc.h>
 
-#include "_adapter/_completion_queue.h"
+#include "grpc/_adapter/_completion_queue.h"
-#include "_adapter/_channel.h"
+#include "grpc/_adapter/_channel.h"
-#include "_adapter/_call.h"
+#include "grpc/_adapter/_call.h"
-#include "_adapter/_server.h"
+#include "grpc/_adapter/_server.h"
-#include "_adapter/_server_credentials.h"
+#include "grpc/_adapter/_server_credentials.h"
 
 static PyObject *init(PyObject *self, PyObject *args) {
   grpc_init();

src/python/src/grpc/_adapter/_c_test.py

@@ -33,8 +33,8 @@ import threading
 import time
 import unittest
 
-from _adapter import _c
+from grpc._adapter import _c
-from _adapter import _datatypes
+from grpc._adapter import _datatypes
 
 _TIMEOUT = 3
 _FUTURE = time.time() + 60 * 60 * 24

src/python/src/grpc/_adapter/_call.c

@@ -31,15 +31,15 @@
  *
  */
 
-#include "_adapter/_call.h"
+#include "grpc/_adapter/_call.h"
 
 #include <math.h>
 #include <Python.h>
 #include <grpc/grpc.h>
 
-#include "_adapter/_channel.h"
+#include "grpc/_adapter/_channel.h"
-#include "_adapter/_completion_queue.h"
+#include "grpc/_adapter/_completion_queue.h"
-#include "_adapter/_error.h"
+#include "grpc/_adapter/_error.h"
 
 static int pygrpc_call_init(Call *self, PyObject *args, PyObject *kwds) {
   const PyObject *channel;

src/python/src/grpc/_adapter/_channel.c

@@ -31,7 +31,7 @@
  *
  */
 
-#include "_adapter/_channel.h"
+#include "grpc/_adapter/_channel.h"
 
 #include <Python.h>
 #include <grpc/grpc.h>

src/python/src/grpc/_adapter/_completion_queue.c

@@ -31,13 +31,13 @@
  *
  */
 
-#include "_adapter/_completion_queue.h"
+#include "grpc/_adapter/_completion_queue.h"
 
 #include <Python.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 
-#include "_adapter/_call.h"
+#include "grpc/_adapter/_call.h"
 
 static PyObject *status_class;
 static PyObject *service_acceptance_class;
@@ -500,7 +500,7 @@ static int pygrpc_get_event_kinds(PyObject *event_class) {
 }
 
 int pygrpc_add_completion_queue(PyObject *module) {
-  char *datatypes_module_path = "_adapter._datatypes";
+  char *datatypes_module_path = "grpc._adapter._datatypes";
   PyObject *datatypes_module = PyImport_ImportModule(datatypes_module_path);
   if (datatypes_module == NULL) {
     PyErr_SetString(PyExc_ImportError, datatypes_module_path);

src/python/src/grpc/_adapter/_error.c

@@ -31,7 +31,7 @@
  *
  */
 
-#include "_adapter/_error.h"
+#include "grpc/_adapter/_error.h"
 
 #include <Python.h>
 #include <grpc/grpc.h>

src/python/src/grpc/_adapter/_event_invocation_synchronous_event_service_test.py

@@ -31,8 +31,8 @@
 
 import unittest
 
-from _adapter import _face_test_case
+from grpc._adapter import _face_test_case
-from _framework.face.testing import event_invocation_synchronous_event_service_test_case as test_case
+from grpc.framework.face.testing import event_invocation_synchronous_event_service_test_case as test_case
 
 
 class EventInvocationSynchronousEventServiceTest(

src/python/src/grpc/_adapter/_face_test_case.py

@@ -31,15 +31,15 @@
 
 import unittest
 
-from _adapter import fore
+from grpc._adapter import fore
-from _adapter import rear
+from grpc._adapter import rear
-from _framework.base import util
+from grpc.framework.base import util
-from _framework.base.packets import implementations as tickets_implementations
+from grpc.framework.base.packets import implementations as tickets_implementations
-from _framework.face import implementations as face_implementations
+from grpc.framework.face import implementations as face_implementations
-from _framework.face.testing import coverage
+from grpc.framework.face.testing import coverage
-from _framework.face.testing import serial
+from grpc.framework.face.testing import serial
-from _framework.face.testing import test_case
+from grpc.framework.face.testing import test_case
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _TIMEOUT = 3
 _MAXIMUM_TIMEOUT = 90

src/python/src/grpc/_adapter/_future_invocation_asynchronous_event_service_test.py

@@ -31,8 +31,8 @@
 
 import unittest
 
-from _adapter import _face_test_case
+from grpc._adapter import _face_test_case
-from _framework.face.testing import future_invocation_asynchronous_event_service_test_case as test_case
+from grpc.framework.face.testing import future_invocation_asynchronous_event_service_test_case as test_case
 
 
 class FutureInvocationAsynchronousEventServiceTest(

src/python/src/grpc/_adapter/_links_test.py

@@ -32,13 +32,13 @@
 import threading
 import unittest
 
-from _adapter import _proto_scenarios
+from grpc._adapter import _proto_scenarios
-from _adapter import _test_links
+from grpc._adapter import _test_links
-from _adapter import fore
+from grpc._adapter import fore
-from _adapter import rear
+from grpc._adapter import rear
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import packets as tickets
+from grpc.framework.base.packets import packets as tickets
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _IDENTITY = lambda x: x
 _TIMEOUT = 2

src/python/src/grpc/_adapter/_lonely_rear_link_test.py

@@ -31,11 +31,11 @@
 
 import unittest
 
-from _adapter import _test_links
+from grpc._adapter import _test_links
-from _adapter import rear
+from grpc._adapter import rear
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _IDENTITY = lambda x: x
 _TIMEOUT = 2

src/python/src/grpc/_adapter/_low.py

@@ -32,8 +32,8 @@
 import atexit
 import gc
 
-from _adapter import _c
+from grpc._adapter import _c
-from _adapter import _datatypes
+from grpc._adapter import _datatypes
 
 def _shut_down():
   # force garbage collection before shutting down grpc, to ensure all grpc

src/python/src/grpc/_adapter/_low_test.py

@@ -32,7 +32,7 @@
 import time
 import unittest
 
-from _adapter import _low
+from grpc._adapter import _low
 
 _STREAM_LENGTH = 300
 _TIMEOUT = 5

src/python/src/grpc/_adapter/_proto_scenarios.py

@@ -32,7 +32,7 @@
 import abc
 import threading
 
-from _junkdrawer import math_pb2
+from grpc._junkdrawer import math_pb2
 
 
 class ProtoScenario(object):

src/python/src/grpc/_adapter/_server.c

@@ -31,14 +31,14 @@
  *
  */
 
-#include "_adapter/_server.h"
+#include "grpc/_adapter/_server.h"
 
 #include <Python.h>
 #include <grpc/grpc.h>
 
-#include "_adapter/_completion_queue.h"
+#include "grpc/_adapter/_completion_queue.h"
-#include "_adapter/_error.h"
+#include "grpc/_adapter/_error.h"
-#include "_adapter/_server_credentials.h"
+#include "grpc/_adapter/_server_credentials.h"
 
 static int pygrpc_server_init(Server *self, PyObject *args, PyObject *kwds) {
   const PyObject *completion_queue;

src/python/src/grpc/_adapter/_server_credentials.c

@@ -31,7 +31,7 @@
  *
  */
 
-#include "_adapter/_server_credentials.h"
+#include "grpc/_adapter/_server_credentials.h"
 
 #include <Python.h>
 #include <grpc/grpc_security.h>

src/python/src/grpc/_adapter/_test_links.py

@@ -31,7 +31,7 @@
 
 import threading
 
-from _framework.base.packets import interfaces
+from grpc.framework.base.packets import interfaces
 
 
 class ForeLink(interfaces.ForeLink):

src/python/src/grpc/_adapter/fore.py

@@ -34,12 +34,12 @@ import logging
 import threading
 import time
 
-from _adapter import _common
+from grpc._adapter import _common
-from _adapter import _low
+from grpc._adapter import _low
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import interfaces as ticket_interfaces
+from grpc.framework.base.packets import interfaces as ticket_interfaces
-from _framework.base.packets import null
+from grpc.framework.base.packets import null
-from _framework.base.packets import packets as tickets
+from grpc.framework.base.packets import packets as tickets
 
 
 @enum.unique

src/python/src/grpc/_adapter/rear.py

@@ -34,11 +34,11 @@ import logging
 import threading
 import time
 
-from _adapter import _common
+from grpc._adapter import _common
-from _adapter import _low
+from grpc._adapter import _low
-from _framework.base.packets import interfaces as ticket_interfaces
+from grpc.framework.base.packets import interfaces as ticket_interfaces
-from _framework.base.packets import null
+from grpc.framework.base.packets import null
-from _framework.base.packets import packets as tickets
+from grpc.framework.base.packets import packets as tickets
 
 _INVOCATION_EVENT_KINDS = (
     _low.Event.Kind.METADATA_ACCEPTED,

src/python/src/grpc/early_adopter/_face_utilities.py

@@ -30,9 +30,9 @@
 import abc
 import collections
 
-from _framework.face import interfaces as face_interfaces
+from grpc.framework.face import interfaces as face_interfaces
 
-from grpc_early_adopter import interfaces
+from grpc.early_adopter import interfaces
 
 
 class _InlineUnaryUnaryMethod(face_interfaces.InlineValueInValueOutMethod):

src/python/src/grpc/early_adopter/implementations.py

@@ -31,12 +31,12 @@
 
 import threading
 
-from _adapter import fore
+from grpc._adapter import fore
-from _framework.base.packets import implementations as _tickets_implementations
+from grpc.framework.base.packets import implementations as _tickets_implementations
-from _framework.face import implementations as _face_implementations
+from grpc.framework.face import implementations as _face_implementations
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
-from grpc_early_adopter import _face_utilities
+from grpc.early_adopter import _face_utilities
-from grpc_early_adopter import interfaces
+from grpc.early_adopter import interfaces
 
 _MEGA_TIMEOUT = 60 * 60 * 24
 _THREAD_POOL_SIZE = 80

src/python/src/grpc/early_adopter/utilities.py

@@ -29,7 +29,7 @@
 
 """Utilities for use with GRPC."""
 
-from grpc_early_adopter import interfaces
+from grpc.early_adopter import interfaces
 
 
 class _RpcMethod(interfaces.RpcMethod):

src/python/src/grpc/framework/base/interfaces.py

@@ -33,7 +33,7 @@ import abc
 import enum
 
 # stream is referenced from specification in this module.
-from _framework.foundation import stream  # pylint: disable=unused-import
+from grpc.framework.foundation import stream  # pylint: disable=unused-import
 
 
 @enum.unique

src/python/src/grpc/framework/base/interfaces_test.py

@@ -32,11 +32,11 @@
 import threading
 import time
 
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base import util
+from grpc.framework.base import util
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
-from _framework.foundation import stream_testing
+from grpc.framework.foundation import stream_testing
-from _framework.foundation import stream_util
+from grpc.framework.foundation import stream_util
 
 TICK = 0.1
 SMALL_TIMEOUT = TICK * 50

src/python/src/grpc/framework/base/packets/_cancellation.py

@@ -29,8 +29,8 @@
 
 """State and behavior for operation cancellation."""
 
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
 
 
 class CancellationManager(_interfaces.CancellationManager):

src/python/src/grpc/framework/base/packets/_context.py

@@ -32,9 +32,9 @@
 import time
 
 # _interfaces and packets are referenced from specification in this module.
-from _framework.base import interfaces as base_interfaces
+from grpc.framework.base import interfaces as base_interfaces
-from _framework.base.packets import _interfaces  # pylint: disable=unused-import
+from grpc.framework.base.packets import _interfaces  # pylint: disable=unused-import
-from _framework.base.packets import packets  # pylint: disable=unused-import
+from grpc.framework.base.packets import packets  # pylint: disable=unused-import
 
 
 class OperationContext(base_interfaces.OperationContext):

src/python/src/grpc/framework/base/packets/_emission.py

@@ -30,8 +30,8 @@
 """State and behavior for handling emitted values."""
 
 # packets is referenced from specifications in this module.
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets  # pylint: disable=unused-import
+from grpc.framework.base.packets import packets  # pylint: disable=unused-import
 
 
 class _EmissionManager(_interfaces.EmissionManager):

src/python/src/grpc/framework/base/packets/_ends.py

@@ -34,19 +34,19 @@ import threading
 import uuid
 
 # _interfaces and packets are referenced from specification in this module.
-from _framework.base import interfaces as base_interfaces
+from grpc.framework.base import interfaces as base_interfaces
-from _framework.base.packets import _cancellation
+from grpc.framework.base.packets import _cancellation
-from _framework.base.packets import _context
+from grpc.framework.base.packets import _context
-from _framework.base.packets import _emission
+from grpc.framework.base.packets import _emission
-from _framework.base.packets import _expiration
+from grpc.framework.base.packets import _expiration
-from _framework.base.packets import _ingestion
+from grpc.framework.base.packets import _ingestion
-from _framework.base.packets import _interfaces  # pylint: disable=unused-import
+from grpc.framework.base.packets import _interfaces  # pylint: disable=unused-import
-from _framework.base.packets import _reception
+from grpc.framework.base.packets import _reception
-from _framework.base.packets import _termination
+from grpc.framework.base.packets import _termination
-from _framework.base.packets import _transmission
+from grpc.framework.base.packets import _transmission
-from _framework.base.packets import interfaces
+from grpc.framework.base.packets import interfaces
-from _framework.base.packets import packets  # pylint: disable=unused-import
+from grpc.framework.base.packets import packets  # pylint: disable=unused-import
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
 
 _IDLE_ACTION_EXCEPTION_LOG_MESSAGE = 'Exception calling idle action!'
 

src/python/src/grpc/framework/base/packets/_expiration.py

@@ -31,9 +31,9 @@
 
 import time
 
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
-from _framework.foundation import later
+from grpc.framework.foundation import later
 
 
 class _ExpirationManager(_interfaces.ExpirationManager):

src/python/src/grpc/framework/base/packets/_ingestion.py

@@ -32,14 +32,14 @@
 import abc
 import collections
 
-from _framework.base import exceptions
+from grpc.framework.base import exceptions
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import _constants
+from grpc.framework.base.packets import _constants
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
-from _framework.foundation import abandonment
+from grpc.framework.foundation import abandonment
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
 
 _CREATE_CONSUMER_EXCEPTION_LOG_MESSAGE = 'Exception initializing ingestion!'
 _CONSUME_EXCEPTION_LOG_MESSAGE = 'Exception during ingestion!'

src/python/src/grpc/framework/base/packets/_interfaces.py

@@ -32,9 +32,9 @@
 import abc
 
 # base_interfaces and packets are referenced from specification in this module.
-from _framework.base import interfaces as base_interfaces  # pylint: disable=unused-import
+from grpc.framework.base import interfaces as base_interfaces  # pylint: disable=unused-import
-from _framework.base.packets import packets  # pylint: disable=unused-import
+from grpc.framework.base.packets import packets  # pylint: disable=unused-import
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
 
 
 class TerminationManager(object):

src/python/src/grpc/framework/base/packets/_reception.py

@@ -31,8 +31,8 @@
 
 import abc
 
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
 
 
 class _Receiver(object):

src/python/src/grpc/framework/base/packets/_termination.py

@@ -31,11 +31,11 @@
 
 import enum
 
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import _constants
+from grpc.framework.base.packets import _constants
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
 
 _CALLBACK_EXCEPTION_LOG_MESSAGE = 'Exception calling termination callback!'
 

src/python/src/grpc/framework/base/packets/_transmission.py

@@ -31,11 +31,11 @@
 
 import abc
 
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import _constants
+from grpc.framework.base.packets import _constants
-from _framework.base.packets import _interfaces
+from grpc.framework.base.packets import _interfaces
-from _framework.base.packets import packets
+from grpc.framework.base.packets import packets
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
 
 _TRANSMISSION_EXCEPTION_LOG_MESSAGE = 'Exception during transmission!'
 

src/python/src/grpc/framework/base/packets/implementations.py

@@ -30,8 +30,8 @@
 """Entry points into the packet-exchange-based implementation the base layer."""
 
 # interfaces is referenced from specification in this module.
-from _framework.base.packets import _ends
+from grpc.framework.base.packets import _ends
-from _framework.base.packets import interfaces  # pylint: disable=unused-import
+from grpc.framework.base.packets import interfaces  # pylint: disable=unused-import
 
 
 def front(work_pool, transmission_pool, utility_pool):

src/python/src/grpc/framework/base/packets/implementations_test.py

@@ -31,10 +31,10 @@
 
 import unittest
 
-from _framework.base import interfaces_test
+from grpc.framework.base import interfaces_test
-from _framework.base import util
+from grpc.framework.base import util
-from _framework.base.packets import implementations
+from grpc.framework.base.packets import implementations
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 POOL_MAX_WORKERS = 100
 DEFAULT_TIMEOUT = 30

src/python/src/grpc/framework/base/packets/in_memory.py

@@ -31,9 +31,9 @@
 
 import threading
 
-from _framework.base.packets import _constants
+from grpc.framework.base.packets import _constants
-from _framework.base.packets import interfaces
+from grpc.framework.base.packets import interfaces
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
 
 
 class _Serializer(object):

src/python/src/grpc/framework/base/packets/interfaces.py

@@ -32,8 +32,8 @@
 import abc
 
 # packets is referenced from specifications in this module.
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
-from _framework.base.packets import packets  # pylint: disable=unused-import
+from grpc.framework.base.packets import packets  # pylint: disable=unused-import
 
 
 class ForeLink(object):

src/python/src/grpc/framework/base/packets/null.py

@@ -29,7 +29,7 @@
 
 """Null links that ignore tickets passed to them."""
 
-from _framework.base.packets import interfaces
+from grpc.framework.base.packets import interfaces
 
 
 class _NullForeLink(interfaces.ForeLink):

src/python/src/grpc/framework/base/packets/packets.py

@@ -33,7 +33,7 @@ import collections
 import enum
 
 # interfaces is referenced from specifications in this module.
-from _framework.base import interfaces  # pylint: disable=unused-import
+from grpc.framework.base import interfaces  # pylint: disable=unused-import
 
 
 @enum.unique

src/python/src/grpc/framework/base/util.py

@@ -32,7 +32,7 @@
 import collections
 import threading
 
-from _framework.base import interfaces
+from grpc.framework.base import interfaces
 
 
 class _ServicedSubscription(

src/python/src/grpc/framework/face/_calls.py

@@ -32,12 +32,12 @@
 import sys
 import threading
 
-from _framework.base import interfaces as base_interfaces
+from grpc.framework.base import interfaces as base_interfaces
-from _framework.base import util as base_util
+from grpc.framework.base import util as base_util
-from _framework.face import _control
+from grpc.framework.face import _control
-from _framework.face import interfaces
+from grpc.framework.face import interfaces
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
-from _framework.foundation import future
+from grpc.framework.foundation import future
 
 _ITERATOR_EXCEPTION_LOG_MESSAGE = 'Exception iterating over requests!'
 _DONE_CALLBACK_LOG_MESSAGE = 'Exception calling Future "done" callback!'

src/python/src/grpc/framework/face/_control.py

@@ -31,11 +31,11 @@
 
 import threading
 
-from _framework.base import interfaces as base_interfaces
+from grpc.framework.base import interfaces as base_interfaces
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face import interfaces
+from grpc.framework.face import interfaces
-from _framework.foundation import abandonment
+from grpc.framework.foundation import abandonment
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
 
 INTERNAL_ERROR_LOG_MESSAGE = ':-( RPC Framework (Face) Internal Error! :-('
 

src/python/src/grpc/framework/face/_service.py

@@ -31,14 +31,14 @@
 
 # base_interfaces and interfaces are referenced from specification in this
 # module.
-from _framework.base import interfaces as base_interfaces  # pylint: disable=unused-import
+from grpc.framework.base import interfaces as base_interfaces  # pylint: disable=unused-import
-from _framework.face import _control
+from grpc.framework.face import _control
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face import interfaces  # pylint: disable=unused-import
+from grpc.framework.face import interfaces  # pylint: disable=unused-import
-from _framework.foundation import abandonment
+from grpc.framework.foundation import abandonment
-from _framework.foundation import callable_util
+from grpc.framework.foundation import callable_util
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
-from _framework.foundation import stream_util
+from grpc.framework.foundation import stream_util
 
 
 class _ValueInStreamOutConsumer(stream.Consumer):

src/python/src/grpc/framework/face/_test_case.py

@@ -29,10 +29,10 @@
 
 """Common lifecycle code for in-memory-ticket-exchange Face-layer tests."""
 
-from _framework.face import implementations
+from grpc.framework.face import implementations
-from _framework.face.testing import base_util
+from grpc.framework.face.testing import base_util
-from _framework.face.testing import test_case
+from grpc.framework.face.testing import test_case
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _TIMEOUT = 3
 _MAXIMUM_POOL_SIZE = 100

src/python/src/grpc/framework/face/blocking_invocation_inline_service_test.py

@@ -31,8 +31,8 @@
 
 import unittest
 
-from _framework.face import _test_case
+from grpc.framework.face import _test_case
-from _framework.face.testing import blocking_invocation_inline_service_test_case as test_case
+from grpc.framework.face.testing import blocking_invocation_inline_service_test_case as test_case
 
 
 class BlockingInvocationInlineServiceTest(

src/python/src/grpc/framework/face/demonstration.py

@@ -29,10 +29,10 @@
 
 """Demonstration-suitable implementation of the face layer of RPC Framework."""
 
-from _framework.base import util as _base_util
+from grpc.framework.base import util as _base_util
-from _framework.base.packets import implementations as _tickets_implementations
+from grpc.framework.base.packets import implementations as _tickets_implementations
-from _framework.face import implementations
+from grpc.framework.face import implementations
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _POOL_SIZE_LIMIT = 20
 

src/python/src/grpc/framework/face/event_invocation_synchronous_event_service_test.py

@@ -31,8 +31,8 @@
 
 import unittest
 
-from _framework.face import _test_case
+from grpc.framework.face import _test_case
-from _framework.face.testing import event_invocation_synchronous_event_service_test_case as test_case
+from grpc.framework.face.testing import event_invocation_synchronous_event_service_test_case as test_case
 
 
 class EventInvocationSynchronousEventServiceTest(

src/python/src/grpc/framework/face/future_invocation_asynchronous_event_service_test.py

@@ -31,8 +31,8 @@
 
 import unittest
 
-from _framework.face import _test_case
+from grpc.framework.face import _test_case
-from _framework.face.testing import future_invocation_asynchronous_event_service_test_case as test_case
+from grpc.framework.face.testing import future_invocation_asynchronous_event_service_test_case as test_case
 
 
 class FutureInvocationAsynchronousEventServiceTest(

src/python/src/grpc/framework/face/implementations.py

@@ -29,12 +29,12 @@
 
 """Entry points into the Face layer of RPC Framework."""
 
-from _framework.base import exceptions as _base_exceptions
+from grpc.framework.base import exceptions as _base_exceptions
-from _framework.base import interfaces as base_interfaces
+from grpc.framework.base import interfaces as base_interfaces
-from _framework.face import _calls
+from grpc.framework.face import _calls
-from _framework.face import _service
+from grpc.framework.face import _service
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face import interfaces
+from grpc.framework.face import interfaces
 
 
 class _BaseServicer(base_interfaces.Servicer):

src/python/src/grpc/framework/face/interfaces.py

@@ -34,9 +34,9 @@ import enum
 
 # exceptions, abandonment, and future are referenced from specification in this
 # module.
-from _framework.face import exceptions  # pylint: disable=unused-import
+from grpc.framework.face import exceptions  # pylint: disable=unused-import
-from _framework.foundation import abandonment  # pylint: disable=unused-import
+from grpc.framework.foundation import abandonment  # pylint: disable=unused-import
-from _framework.foundation import future  # pylint: disable=unused-import
+from grpc.framework.foundation import future  # pylint: disable=unused-import
 
 
 class CancellableIterator(object):

src/python/src/grpc/framework/face/testing/base_util.py

@@ -32,11 +32,11 @@
 import abc
 
 # interfaces is referenced from specification in this module.
-from _framework.base import util as _base_util
+from grpc.framework.base import util as _base_util
-from _framework.base.packets import implementations
+from grpc.framework.base.packets import implementations
-from _framework.base.packets import in_memory
+from grpc.framework.base.packets import in_memory
-from _framework.base.packets import interfaces  # pylint: disable=unused-import
+from grpc.framework.base.packets import interfaces  # pylint: disable=unused-import
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _POOL_SIZE_LIMIT = 20
 

src/python/src/grpc/framework/face/testing/blocking_invocation_inline_service_test_case.py

@@ -33,12 +33,12 @@
 import abc
 import unittest  # pylint: disable=unused-import
 
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face.testing import control
+from grpc.framework.face.testing import control
-from _framework.face.testing import coverage
+from grpc.framework.face.testing import coverage
-from _framework.face.testing import digest
+from grpc.framework.face.testing import digest
-from _framework.face.testing import stock_service
+from grpc.framework.face.testing import stock_service
-from _framework.face.testing import test_case
+from grpc.framework.face.testing import test_case
 
 _TIMEOUT = 3
 

src/python/src/grpc/framework/face/testing/callback.py

@@ -31,7 +31,7 @@
 
 import threading
 
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
 
 
 class Callback(stream.Consumer):

src/python/src/grpc/framework/face/testing/digest.py

@@ -34,13 +34,13 @@ import threading
 
 # testing_control, interfaces, and testing_service are referenced from
 # specification in this module.
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face import interfaces as face_interfaces
+from grpc.framework.face import interfaces as face_interfaces
-from _framework.face.testing import control as testing_control  # pylint: disable=unused-import
+from grpc.framework.face.testing import control as testing_control  # pylint: disable=unused-import
-from _framework.face.testing import interfaces  # pylint: disable=unused-import
+from grpc.framework.face.testing import interfaces  # pylint: disable=unused-import
-from _framework.face.testing import service as testing_service  # pylint: disable=unused-import
+from grpc.framework.face.testing import service as testing_service  # pylint: disable=unused-import
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
-from _framework.foundation import stream_util
+from grpc.framework.foundation import stream_util
 
 _IDENTITY = lambda x: x
 

src/python/src/grpc/framework/face/testing/event_invocation_synchronous_event_service_test_case.py

@@ -32,13 +32,13 @@
 import abc
 import unittest
 
-from _framework.face import interfaces
+from grpc.framework.face import interfaces
-from _framework.face.testing import callback as testing_callback
+from grpc.framework.face.testing import callback as testing_callback
-from _framework.face.testing import control
+from grpc.framework.face.testing import control
-from _framework.face.testing import coverage
+from grpc.framework.face.testing import coverage
-from _framework.face.testing import digest
+from grpc.framework.face.testing import digest
-from _framework.face.testing import stock_service
+from grpc.framework.face.testing import stock_service
-from _framework.face.testing import test_case
+from grpc.framework.face.testing import test_case
 
 _TIMEOUT = 3
 

src/python/src/grpc/framework/face/testing/future_invocation_asynchronous_event_service_test_case.py

@@ -34,14 +34,14 @@ import contextlib
 import threading
 import unittest
 
-from _framework.face import exceptions
+from grpc.framework.face import exceptions
-from _framework.face.testing import control
+from grpc.framework.face.testing import control
-from _framework.face.testing import coverage
+from grpc.framework.face.testing import coverage
-from _framework.face.testing import digest
+from grpc.framework.face.testing import digest
-from _framework.face.testing import stock_service
+from grpc.framework.face.testing import stock_service
-from _framework.face.testing import test_case
+from grpc.framework.face.testing import test_case
-from _framework.foundation import future
+from grpc.framework.foundation import future
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _TIMEOUT = 3
 _MAXIMUM_POOL_SIZE = 100

src/python/src/grpc/framework/face/testing/interfaces.py

@@ -32,7 +32,7 @@
 import abc
 
 # cardinality is referenced from specification in this module.
-from _framework.common import cardinality  # pylint: disable=unused-import
+from grpc.framework.common import cardinality  # pylint: disable=unused-import
 
 
 class Method(object):

src/python/src/grpc/framework/face/testing/service.py

@@ -32,8 +32,8 @@
 import abc
 
 # interfaces is referenced from specification in this module.
-from _framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
+from grpc.framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
-from _framework.face.testing import interfaces
+from grpc.framework.face.testing import interfaces
 
 
 class UnaryUnaryTestMethod(interfaces.Method):

src/python/src/grpc/framework/face/testing/stock_service.py

@@ -29,12 +29,12 @@
 
 """Examples of Python implementations of the stock.proto Stock service."""
 
-from _framework.common import cardinality
+from grpc.framework.common import cardinality
-from _framework.face.testing import service
+from grpc.framework.face.testing import service
-from _framework.foundation import abandonment
+from grpc.framework.foundation import abandonment
-from _framework.foundation import stream
+from grpc.framework.foundation import stream
-from _framework.foundation import stream_util
+from grpc.framework.foundation import stream_util
-from _junkdrawer import stock_pb2
+from grpc._junkdrawer import stock_pb2
 
 SYMBOL_FORMAT = 'test symbol:%03d'
 STREAM_LENGTH = 400

src/python/src/grpc/framework/face/testing/test_case.py

@@ -32,8 +32,8 @@
 import abc
 
 # face_interfaces and interfaces are referenced in specification in this module.
-from _framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
+from grpc.framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
-from _framework.face.testing import interfaces  # pylint: disable=unused-import
+from grpc.framework.face.testing import interfaces  # pylint: disable=unused-import
 
 
 class FaceTestCase(object):

src/python/src/grpc/framework/foundation/_later_test.py

@@ -33,7 +33,7 @@ import threading
 import time
 import unittest
 
-from _framework.foundation import later
+from grpc.framework.foundation import later
 
 TICK = 0.1
 

src/python/src/grpc/framework/foundation/_logging_pool_test.py

@@ -31,7 +31,7 @@
 
 import unittest
 
-from _framework.foundation import logging_pool
+from grpc.framework.foundation import logging_pool
 
 _POOL_SIZE = 16
 

src/python/src/grpc/framework/foundation/_timer_future.py

@@ -33,7 +33,7 @@ import sys
 import threading
 import time
 
-from _framework.foundation import future
+from grpc.framework.foundation import future
 
 
 class TimerFuture(future.Future):

src/python/src/grpc/framework/foundation/later.py

@@ -31,7 +31,7 @@
 
 import time
 
-from _framework.foundation import _timer_future
+from grpc.framework.foundation import _timer_future
 
 
 def later(delay, computation):