From 62cc91118884c867c1f022002c4f9e8899078e87 Mon Sep 17 00:00:00 2001 From: Masood Malekghassemi Date: Thu, 28 Jan 2016 11:00:24 -0800 Subject: Fix Python diagnostics dying on bad diagnosis --- src/python/grpcio/commands.py | 2 +- src/python/grpcio/support.py | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'src/python/grpcio') diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index a6b8ad3fc0..3e3c72ff6e 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -323,7 +323,7 @@ class BuildExt(build_ext.build_ext): except KeyboardInterrupt: raise except Exception as error: - support.diagnose_build_ext_error(self, error) + support.diagnose_build_ext_error(self, error, traceback.format_exc()) raise CommandError("Failed `build_ext` step.") diff --git a/src/python/grpcio/support.py b/src/python/grpcio/support.py index bbc509653d..96d9cbf4f3 100644 --- a/src/python/grpcio/support.py +++ b/src/python/grpcio/support.py @@ -76,16 +76,23 @@ def _expect_compile(compiler, source_string, error_message): "Diagnostics found a compilation environment issue:\n{}" .format(error_message)) -def diagnose_build_ext_error(build_ext, error): - { - errors.CompileError: diagnose_compile_error - }[type(error)](build_ext, error) - def diagnose_compile_error(build_ext, error): """Attempt to run a few test files through the compiler to see if we can diagnose the reason for the compile failure.""" for c_check, message in C_CHECKS.items(): _expect_compile(build_ext.compiler, c_check, message) - raise commands.CommandError( - "\n\nWe could not diagnose your build failure. Please file an issue at " - "http://www.github.com/grpc/grpc with `[Python install]` in the title.") + +_ERROR_DIAGNOSES = { + errors.CompileError: diagnose_compile_error +} + +def diagnose_build_ext_error(build_ext, error, formatted): + diagnostic = _ERROR_DIAGNOSES.get(type(error)) + if diagnostic is None: + raise commands.CommandError( + "\n\nWe could not diagnose your build failure. Please file an issue at " + "http://www.github.com/grpc/grpc with `[Python install]` in the title." + "\n\n{}".format(formatted)) + else: + diagnostic(build_ext, error) + -- cgit v1.2.3