Merge pull request #13719 from ncteisen/yapf-tools

Yapf tools/

5 files changed, 169 insertions, 160 deletions

diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py b/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py
index 1454b678e1..5772620b60 100644
--- a/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py
@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/command.py b/tools/distrib/python/grpcio_tools/grpc_tools/command.py
index 28be137045..c0f9d93b0a 100644
--- a/tools/distrib/python/grpcio_tools/grpc_tools/command.py
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/command.py
@@ -22,43 +22,44 @@ from grpc_tools import protoc
 
 
 def build_package_protos(package_root):
-  proto_files = []
-  inclusion_root = os.path.abspath(package_root)
-  for root, _, files in os.walk(inclusion_root):
-    for filename in files:
-      if filename.endswith('.proto'):
-        proto_files.append(os.path.abspath(os.path.join(root, filename)))
+    proto_files = []
+    inclusion_root = os.path.abspath(package_root)
+    for root, _, files in os.walk(inclusion_root):
+        for filename in files:
+            if filename.endswith('.proto'):
+                proto_files.append(
+                    os.path.abspath(os.path.join(root, filename)))
 
-  well_known_protos_include = pkg_resources.resource_filename(
-      'grpc_tools', '_proto')
+    well_known_protos_include = pkg_resources.resource_filename('grpc_tools',
+                                                                '_proto')
 
-  for proto_file in proto_files:
-    command = [
-        'grpc_tools.protoc',
-        '--proto_path={}'.format(inclusion_root),
-        '--proto_path={}'.format(well_known_protos_include),
-        '--python_out={}'.format(inclusion_root),
-        '--grpc_python_out={}'.format(inclusion_root),
-    ] + [proto_file]
-    if protoc.main(command) != 0:
-      sys.stderr.write('warning: {} failed'.format(command))
+    for proto_file in proto_files:
+        command = [
+            'grpc_tools.protoc',
+            '--proto_path={}'.format(inclusion_root),
+            '--proto_path={}'.format(well_known_protos_include),
+            '--python_out={}'.format(inclusion_root),
+            '--grpc_python_out={}'.format(inclusion_root),
+        ] + [proto_file]
+        if protoc.main(command) != 0:
+            sys.stderr.write('warning: {} failed'.format(command))
 
 
 class BuildPackageProtos(setuptools.Command):
-  """Command to generate project *_pb2.py modules from proto files."""
+    """Command to generate project *_pb2.py modules from proto files."""
 
-  description = 'build grpc protobuf modules'
-  user_options = []
+    description = 'build grpc protobuf modules'
+    user_options = []
 
-  def initialize_options(self):
-    pass
+    def initialize_options(self):
+        pass
 
-  def finalize_options(self):
-    pass
+    def finalize_options(self):
+        pass
 
-  def run(self):
-    # due to limitations of the proto generator, we require that only *one*
-    # directory is provided as an 'include' directory. We assume it's the '' key
-    # to `self.distribution.package_dir` (and get a key error if it's not
-    # there).
-    build_package_protos(self.distribution.package_dir[''])
+    def run(self):
+        # due to limitations of the proto generator, we require that only *one*
+        # directory is provided as an 'include' directory. We assume it's the '' key
+        # to `self.distribution.package_dir` (and get a key error if it's not
+        # there).
+        build_package_protos(self.distribution.package_dir[''])
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
index efad51e07b..582cba0e39 100644
--- a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
@@ -19,16 +19,18 @@ import sys
 
 from grpc_tools import _protoc_compiler
 
+
 def main(command_arguments):
-  """Run the protocol buffer compiler with the given command-line arguments.
+    """Run the protocol buffer compiler with the given command-line arguments.
 
   Args:
     command_arguments: a list of strings representing command line arguments to
         `protoc`.
   """
-  command_arguments = [argument.encode() for argument in command_arguments]
-  return _protoc_compiler.run_main(command_arguments)
+    command_arguments = [argument.encode() for argument in command_arguments]
+    return _protoc_compiler.run_main(command_arguments)
+
 
 if __name__ == '__main__':
-  proto_include = pkg_resources.resource_filename('grpc_tools', '_proto')
-  sys.exit(main(sys.argv + ['-I{}'.format(proto_include)]))
+    proto_include = pkg_resources.resource_filename('grpc_tools', '_proto')
+    sys.exit(main(sys.argv + ['-I{}'.format(proto_include)]))
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index f613025be3..c4ed066122 100644
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION='1.9.0.dev0'
+VERSION = '1.9.0.dev0'
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
index 8d95cb5a28..342a220d5e 100644
--- a/tools/distrib/python/grpcio_tools/setup.py
+++ b/tools/distrib/python/grpcio_tools/setup.py
@@ -66,42 +66,42 @@ BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
 EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None)
 EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None)
 if EXTRA_ENV_COMPILE_ARGS is None:
-  EXTRA_ENV_COMPILE_ARGS = '-std=c++11'
-  if 'win32' in sys.platform:
-    if sys.version_info < (3, 5):
-      # We use define flags here and don't directly add to DEFINE_MACROS below to
-      # ensure that the expert user/builder has a way of turning it off (via the
-      # envvars) without adding yet more GRPC-specific envvars.
-      # See https://sourceforge.net/p/mingw-w64/bugs/363/
-      if '32' in platform.architecture()[0]:
-        EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime32 -D_timeb=__timeb32 -D_ftime_s=_ftime32_s -D_hypot=hypot'
-      else:
-        EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64 -D_hypot=hypot'
-    else:
-      # We need to statically link the C++ Runtime, only the C runtime is
-      # available dynamically
-      EXTRA_ENV_COMPILE_ARGS += ' /MT'
-  elif "linux" in sys.platform or "darwin" in sys.platform:
-    EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti'
+    EXTRA_ENV_COMPILE_ARGS = '-std=c++11'
+    if 'win32' in sys.platform:
+        if sys.version_info < (3, 5):
+            # We use define flags here and don't directly add to DEFINE_MACROS below to
+            # ensure that the expert user/builder has a way of turning it off (via the
+            # envvars) without adding yet more GRPC-specific envvars.
+            # See https://sourceforge.net/p/mingw-w64/bugs/363/
+            if '32' in platform.architecture()[0]:
+                EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime32 -D_timeb=__timeb32 -D_ftime_s=_ftime32_s -D_hypot=hypot'
+            else:
+                EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64 -D_hypot=hypot'
+        else:
+            # We need to statically link the C++ Runtime, only the C runtime is
+            # available dynamically
+            EXTRA_ENV_COMPILE_ARGS += ' /MT'
+    elif "linux" in sys.platform or "darwin" in sys.platform:
+        EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti'
 if EXTRA_ENV_LINK_ARGS is None:
-  EXTRA_ENV_LINK_ARGS = ''
-  if "linux" in sys.platform or "darwin" in sys.platform:
-    EXTRA_ENV_LINK_ARGS += ' -lpthread'
-  elif "win32" in sys.platform and sys.version_info < (3, 5):
-    msvcr = cygwinccompiler.get_msvcr()[0]
-    # TODO(atash) sift through the GCC specs to see if libstdc++ can have any
-    # influence on the linkage outcome on MinGW for non-C++ programs.
-    EXTRA_ENV_LINK_ARGS += (
-        ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr} '
-        '-static'.format(msvcr=msvcr))
+    EXTRA_ENV_LINK_ARGS = ''
+    if "linux" in sys.platform or "darwin" in sys.platform:
+        EXTRA_ENV_LINK_ARGS += ' -lpthread'
+    elif "win32" in sys.platform and sys.version_info < (3, 5):
+        msvcr = cygwinccompiler.get_msvcr()[0]
+        # TODO(atash) sift through the GCC specs to see if libstdc++ can have any
+        # influence on the linkage outcome on MinGW for non-C++ programs.
+        EXTRA_ENV_LINK_ARGS += (
+            ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr} '
+            '-static'.format(msvcr=msvcr))
 
 EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS)
 EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS)
 
-CC_FILES = [
-  os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES]
+CC_FILES = [os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES]
 PROTO_FILES = [
-  os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES]
+    os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES
+]
 CC_INCLUDE = os.path.normpath(protoc_lib_deps.CC_INCLUDE)
 PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE)
 
@@ -110,107 +110,114 @@ GRPC_PYTHON_PROTO_RESOURCES_NAME = '_proto'
 
 DEFINE_MACROS = ()
 if "win32" in sys.platform:
-  DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),)
-  if '64bit' in platform.architecture()[0]:
-    DEFINE_MACROS += (('MS_WIN64', 1),)
+    DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),)
+    if '64bit' in platform.architecture()[0]:
+        DEFINE_MACROS += (('MS_WIN64', 1),)
 elif "linux" in sys.platform or "darwin" in sys.platform:
-  DEFINE_MACROS += (('HAVE_PTHREAD', 1),)
+    DEFINE_MACROS += (('HAVE_PTHREAD', 1),)
 
 # By default, Python3 distutils enforces compatibility of
 # c plugins (.so files) with the OSX version Python3 was built with.
 # For Python3.4, this is OSX 10.6, but we need Thread Local Support (__thread)
 if 'darwin' in sys.platform and PY3:
-  mac_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-  if mac_target and (pkg_resources.parse_version(mac_target) <
-		     pkg_resources.parse_version('10.9.0')):
-    os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
-    os.environ['_PYTHON_HOST_PLATFORM'] = re.sub(
-        r'macosx-[0-9]+\.[0-9]+-(.+)',
-        r'macosx-10.9-\1',
-        util.get_platform())
+    mac_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+    if mac_target and (pkg_resources.parse_version(mac_target) <
+                       pkg_resources.parse_version('10.9.0')):
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
+        os.environ['_PYTHON_HOST_PLATFORM'] = re.sub(
+            r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1',
+            util.get_platform())
+
 
 def package_data():
-  tools_path = GRPC_PYTHON_TOOLS_PACKAGE.replace('.', os.path.sep)
-  proto_resources_path = os.path.join(tools_path,
-                                      GRPC_PYTHON_PROTO_RESOURCES_NAME)
-  proto_files = []
-  for proto_file in PROTO_FILES:
-    source = os.path.join(PROTO_INCLUDE, proto_file)
-    target = os.path.join(proto_resources_path, proto_file)
-    relative_target = os.path.join(GRPC_PYTHON_PROTO_RESOURCES_NAME, proto_file)
-    try:
-      os.makedirs(os.path.dirname(target))
-    except OSError as error:
-      if error.errno == errno.EEXIST:
-        pass
-      else:
-        raise
-    shutil.copy(source, target)
-    proto_files.append(relative_target)
-  return {GRPC_PYTHON_TOOLS_PACKAGE: proto_files}
+    tools_path = GRPC_PYTHON_TOOLS_PACKAGE.replace('.', os.path.sep)
+    proto_resources_path = os.path.join(tools_path,
+                                        GRPC_PYTHON_PROTO_RESOURCES_NAME)
+    proto_files = []
+    for proto_file in PROTO_FILES:
+        source = os.path.join(PROTO_INCLUDE, proto_file)
+        target = os.path.join(proto_resources_path, proto_file)
+        relative_target = os.path.join(GRPC_PYTHON_PROTO_RESOURCES_NAME,
+                                       proto_file)
+        try:
+            os.makedirs(os.path.dirname(target))
+        except OSError as error:
+            if error.errno == errno.EEXIST:
+                pass
+            else:
+                raise
+        shutil.copy(source, target)
+        proto_files.append(relative_target)
+    return {GRPC_PYTHON_TOOLS_PACKAGE: proto_files}
+
 
 def extension_modules():
-  if BUILD_WITH_CYTHON:
-    plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.pyx')]
-  else:
-    plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.cpp')]
-
-  plugin_sources += [
-    os.path.join('grpc_tools', 'main.cc'),
-    os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')]
-
-  #HACK: Substitute the embed.cc, which is a JS to C++
-  #      preprocessor with the generated code.
-  #      The generated code should not be material
-  #      to the parts of protoc we use (it affects
-  #      the JavaScript code generator, supposedly),
-  #      but we need to be cautious about it.
-  cc_files_clone = list(CC_FILES)
-  embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc')
-  well_known_types_file = os.path.normpath(
-      'google/protobuf/compiler/js/well_known_types_embed.cc')
-  if embed_cc_file in cc_files_clone:
-    cc_files_clone.remove(embed_cc_file)
-  if well_known_types_file in cc_files_clone:
-    cc_files_clone.remove(well_known_types_file)
-    plugin_sources += [os.path.join('grpc_tools', 'protobuf_generated_well_known_types_embed.cc')]
-  plugin_sources += [os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone]
-
-  plugin_ext = extension.Extension(
-      name='grpc_tools._protoc_compiler',
-      sources=plugin_sources,
-      include_dirs=[
-          '.',
-          'grpc_root',
-          os.path.join('grpc_root', 'include'),
-          CC_INCLUDE,
-      ],
-      language='c++',
-      define_macros=list(DEFINE_MACROS),
-      extra_compile_args=list(EXTRA_COMPILE_ARGS),
-      extra_link_args=list(EXTRA_LINK_ARGS),
-  )
-  extensions = [plugin_ext]
-  if BUILD_WITH_CYTHON:
-    from Cython import Build
-    return Build.cythonize(extensions)
-  else:
-    return extensions
+    if BUILD_WITH_CYTHON:
+        plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.pyx')]
+    else:
+        plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.cpp')]
+
+    plugin_sources += [
+        os.path.join('grpc_tools', 'main.cc'),
+        os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')
+    ]
+
+    #HACK: Substitute the embed.cc, which is a JS to C++
+    #      preprocessor with the generated code.
+    #      The generated code should not be material
+    #      to the parts of protoc we use (it affects
+    #      the JavaScript code generator, supposedly),
+    #      but we need to be cautious about it.
+    cc_files_clone = list(CC_FILES)
+    embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc')
+    well_known_types_file = os.path.normpath(
+        'google/protobuf/compiler/js/well_known_types_embed.cc')
+    if embed_cc_file in cc_files_clone:
+        cc_files_clone.remove(embed_cc_file)
+    if well_known_types_file in cc_files_clone:
+        cc_files_clone.remove(well_known_types_file)
+        plugin_sources += [
+            os.path.join('grpc_tools',
+                         'protobuf_generated_well_known_types_embed.cc')
+        ]
+    plugin_sources += [
+        os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone
+    ]
+
+    plugin_ext = extension.Extension(
+        name='grpc_tools._protoc_compiler',
+        sources=plugin_sources,
+        include_dirs=[
+            '.',
+            'grpc_root',
+            os.path.join('grpc_root', 'include'),
+            CC_INCLUDE,
+        ],
+        language='c++',
+        define_macros=list(DEFINE_MACROS),
+        extra_compile_args=list(EXTRA_COMPILE_ARGS),
+        extra_link_args=list(EXTRA_LINK_ARGS),)
+    extensions = [plugin_ext]
+    if BUILD_WITH_CYTHON:
+        from Cython import Build
+        return Build.cythonize(extensions)
+    else:
+        return extensions
+
 
 setuptools.setup(
-  name='grpcio-tools',
-  version=grpc_version.VERSION,
-  description='Protobuf code generator for gRPC',
-  author='The gRPC Authors',
-  author_email='grpc-io@googlegroups.com',
-  url='https://grpc.io',
-  license='Apache License 2.0',
-  classifiers=CLASSIFIERS,
-  ext_modules=extension_modules(),
-  packages=setuptools.find_packages('.'),
-  install_requires=[
-    'protobuf>=3.5.0.post1',
-    'grpcio>={version}'.format(version=grpc_version.VERSION),
-  ],
-  package_data=package_data(),
-)
+    name='grpcio-tools',
+    version=grpc_version.VERSION,
+    description='Protobuf code generator for gRPC',
+    author='The gRPC Authors',
+    author_email='grpc-io@googlegroups.com',
+    url='https://grpc.io',
+    license='Apache License 2.0',
+    classifiers=CLASSIFIERS,
+    ext_modules=extension_modules(),
+    packages=setuptools.find_packages('.'),
+    install_requires=[
+        'protobuf>=3.5.0.post1',
+        'grpcio>={version}'.format(version=grpc_version.VERSION),
+    ],
+    package_data=package_data(),)