diff --git a/configure b/configure
index 66b66ba54ed..7a299f3e274 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@ set -e
 set -o pipefail
 
 if [ -z "$PYTHON_BIN_PATH" ]; then
-  PYTHON_BIN_PATH=$(which python || which python3 || true)
+  PYTHON_BIN_PATH=$( which python3 || true)
 fi
 
 # Set all env variables
diff --git a/tensorflow/python/summary/writer/writer.py b/tensorflow/python/summary/writer/writer.py
index cdced098db8..5b06820abd9 100644
--- a/tensorflow/python/summary/writer/writer.py
+++ b/tensorflow/python/summary/writer/writer.py
@@ -349,15 +349,17 @@ class FileWriter(SummaryToEventTransformer):
       RuntimeError: If called with eager execution enabled.
 
     @compatibility(eager)
-    `v1.summary.FileWriter` is not compatible with eager execution. To write TensorBoard
-    summaries under eager execution, use `tf.summary.create_file_writer` or a 
-    `with v1.Graph().as_default():` context.
+      `v1.summary.FileWriter` is not compatible with eager execution.
+      To write TensorBoard summaries under eager execution,
+      use `tf.summary.create_file_writer` or
+      a `with v1.Graph().as_default():` context.
     @end_compatibility
     """
     if context.executing_eagerly():
       raise RuntimeError(
           "v1.summary.FileWriter is not compatible with eager execution. "
-          "Use `tf.summary.create_file_writer`, or a `with v1.Graph().as_default():` context")
+          "Use `tf.summary.create_file_writer`,"
+           "or a `with v1.Graph().as_default():` context")
     if session is not None:
       event_writer = EventFileWriterV2(
           session, logdir, max_queue, flush_secs, filename_suffix)