Begin enveloping protorpc dependencies. (#158)

Code can now import message_types, messages, and remote directly from
the endpoints library, which gives us flexibility to change things.

Also, all import organization has been standardized using the isort
utility for Python.

Author: inklesspen

endpoints/__init__.py

@@ -20,6 +20,10 @@
 # pylint: disable=wildcard-import
 from __future__ import absolute_import
 
+from protorpc import message_types
+from protorpc import messages
+from protorpc import remote
+
 from .api_config import api, method
 from .api_config import AUTH_LEVEL, EMAIL_SCOPE
 from .api_config import Issuer, LimitDefinition, Namespace

endpoints/_endpointscfg_impl.py

@@ -44,25 +44,28 @@
 import argparse
 import collections
 import contextlib
-# Conditional import, pylint: disable=g-import-not-at-top
-try:
-  import json
-except ImportError:
-  # If we can't find json packaged with Python import simplejson, which is
-  # packaged with the SDK.
-  import simplejson as json
 import logging
 import os
 import re
 import sys
 import urllib
 import urllib2
+
+import yaml
+from google.appengine.ext import testbed
+
 from . import api_config
-from protorpc import remote
 from . import openapi_generator
-import yaml
+from . import remote
+
+# Conditional import, pylint: disable=g-import-not-at-top
+try:
+  import json
+except ImportError:
+  # If we can't find json packaged with Python import simplejson, which is
+  # packaged with the SDK.
+  import simplejson as json
 
-from google.appengine.ext import testbed
 
 DISCOVERY_DOC_BASE = ('https://webapis-discovery.appspot.com/_ah/api/'
                       'discovery/v1/apis/generate/')

endpoints/api_config.py

@@ -39,25 +39,22 @@ def entries_get(self, request):
 import logging
 import re
 
-from . import api_exceptions
-from . import message_parser
-
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
-from protorpc import util
+from google.appengine.api import app_identity
 
 import attr
 import semver
+from protorpc import util
 
+from . import api_exceptions
+from . import constants
+from . import message_parser
+from . import message_types
+from . import messages
+from . import remote
 from . import resource_container
+from . import types as endpoints_types
 from . import users_id_token
 from . import util as endpoints_util
-from . import types as endpoints_types
-from . import constants
-
-from google.appengine.api import app_identity
-
 
 _logger = logging.getLogger(__name__)
 package = 'google.appengine.endpoints'

endpoints/api_exceptions.py

@@ -18,7 +18,7 @@
 
 import httplib
 
-from protorpc import remote
+from . import remote
 
 
 class ServiceException(remote.ApplicationError):

endpoints/apiserving.py

@@ -66,23 +66,21 @@ def list(self, request):
 import logging
 import os
 
-from . import api_config
-from . import api_exceptions
-from . import endpoints_dispatcher
-from . import protojson
-
 from google.appengine.api import app_identity
+
 from endpoints_management.control import client as control_client
 from endpoints_management.control import wsgi as control_wsgi
-
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
 from protorpc.wsgi import service as wsgi_service
 
+from . import api_config
+from . import api_exceptions
+from . import endpoints_dispatcher
+from . import message_types
+from . import messages
+from . import protojson
+from . import remote
 from . import util
 
-
 _logger = logging.getLogger(__name__)
 package = 'google.appengine.endpoints'
 

endpoints/directory_list_generator.py

@@ -23,6 +23,7 @@
 
 from . import util
 
+
 class DirectoryListGenerator(object):
   """Generates a discovery directory list from a ProtoRPC service.
 

endpoints/discovery_generator.py

@@ -23,13 +23,12 @@
 
 from . import api_exceptions
 from . import message_parser
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
+from . import message_types
+from . import messages
+from . import remote
 from . import resource_container
 from . import util
 
-
 _logger = logging.getLogger(__name__)
 _PATH_VARIABLE_PATTERN = r'{([a-zA-Z_][a-zA-Z_.\d]*)}'
 

endpoints/endpoints_dispatcher.py

@@ -32,6 +32,7 @@
 import re
 import urlparse
 import wsgiref
+
 import pkg_resources
 
 from . import api_config_manager
@@ -42,7 +43,6 @@
 from . import parameter_converter
 from . import util
 
-
 _logger = logging.getLogger(__name__)
 
 

endpoints/endpointscfg.py

@@ -23,9 +23,9 @@
 """
 
 import sys
+
 import _endpointscfg_setup  # pylint: disable=unused-import
 from endpoints._endpointscfg_impl import main
 
-
 if __name__ == '__main__':
   main(sys.argv)

endpoints/errors.py

@@ -22,7 +22,6 @@
 
 from . import generated_error_info
 
-
 __all__ = ['BackendError',
            'BasicTypeParameterError',
            'EnumRejectionError',