black: reformat after dropping Python 2.7 and 3.5

Summary:
This is a clean run of Black 19.10b0 after removing `py27` and `py35`
from the list of target versions in `pyproject.toml`. See #4406.

wchargin-branch: black-20x-no27-no35

Author: tensorboard-gardener

tensorboard/backend/event_processing/data_provider.py

@@ -129,7 +129,7 @@ def read_scalars(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         self._validate_context(ctx)
         self._validate_experiment_id(experiment_id)
@@ -156,7 +156,7 @@ def read_tensors(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         self._validate_context(ctx)
         self._validate_experiment_id(experiment_id)
@@ -313,7 +313,7 @@ def read_blob_sequences(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         self._validate_context(ctx)
         self._validate_experiment_id(experiment_id)

tensorboard/backend/event_processing/event_accumulator.py

@@ -778,7 +778,7 @@ def _ExpiredPerTag(value):
                 self.most_recent_wall_time,
                 event.step,
                 event.wall_time,
-                *expired_per_type
+                *expired_per_type,
             )
             logger.warning(purge_msg)
 

tensorboard/backend/event_processing/event_accumulator_test.py

@@ -785,12 +785,12 @@ def testTFSummaryImage(self):
         accumulator.Reload()
 
         tags = [
-            u"1/images/image",
-            u"2/images/image/0",
-            u"2/images/image/1",
-            u"3/images/image/0",
-            u"3/images/image/1",
-            u"3/images/image/2",
+            "1/images/image",
+            "2/images/image/0",
+            "2/images/image/1",
+            "3/images/image/0",
+            "3/images/image/1",
+            "3/images/image/2",
         ]
 
         self.assertTagsEqual(

tensorboard/backend/event_processing/plugin_event_accumulator_test.py

@@ -401,8 +401,8 @@ def testNewStyleScalarSummary(self):
 
         tags = [
             graph_metadata.RUN_GRAPH_NAME,
-            u"accuracy/scalar_summary",
-            u"xent/scalar_summary",
+            "accuracy/scalar_summary",
+            "xent/scalar_summary",
         ]
         self.assertTagsEqual(
             accumulator.Tags(),
@@ -445,9 +445,9 @@ def testNewStyleAudioSummary(self):
 
         tags = [
             graph_metadata.RUN_GRAPH_NAME,
-            u"1/one/audio_summary",
-            u"2/two/audio_summary",
-            u"3/three/audio_summary",
+            "1/one/audio_summary",
+            "2/two/audio_summary",
+            "3/three/audio_summary",
         ]
         self.assertTagsEqual(
             accumulator.Tags(),
@@ -488,9 +488,9 @@ def testNewStyleImageSummary(self):
 
         tags = [
             graph_metadata.RUN_GRAPH_NAME,
-            u"1/images/image_summary",
-            u"2/images/image_summary",
-            u"3/images/image_summary",
+            "1/images/image_summary",
+            "2/images/image_summary",
+            "3/images/image_summary",
         ]
         self.assertTagsEqual(
             accumulator.Tags(),

tensorboard/backend/http_util.py

@@ -232,7 +232,7 @@ def Respond(
                     "data:",
                     # used by What-If tool for image sprites.
                     "blob:",
-                    *_CSP_IMG_DOMAINS_WHITELIST
+                    *_CSP_IMG_DOMAINS_WHITELIST,
                 ),
                 "object-src 'none'",
                 "style-src %s"
@@ -243,7 +243,7 @@ def Respond(
                     "data:",
                     # inline styles: Polymer templates + d3 uses inline styles.
                     "'unsafe-inline'",
-                    *_CSP_STYLE_DOMAINS_WHITELIST
+                    *_CSP_STYLE_DOMAINS_WHITELIST,
                 ),
                 "connect-src %s"
                 % _create_csp_string("'self'", *_CSP_CONNECT_DOMAINS_WHITELIST),

tensorboard/backend/json_util_test.py

@@ -69,7 +69,7 @@ def testSet_turnsIntoSortedList(self):
 
     def testByteString_turnsIntoUnicodeString(self):
         self.assertEqual(
-            json_util.Cleanse(b"\xc2\xa3"), u"\u00a3"
+            json_util.Cleanse(b"\xc2\xa3"), "\u00a3"
         )  # is # sterling
 
 

tensorboard/compat/tensorflow_stub/io/gfile_s3_test.py

@@ -156,10 +156,8 @@ def testRead(self):
 
     @mock_s3
     def testReadLines(self):
-        ckpt_lines = (
-            [u"\n"] + [u"line {}\n".format(i) for i in range(10)] + [u" "]
-        )
-        ckpt_content = u"".join(ckpt_lines)
+        ckpt_lines = ["\n"] + ["line {}\n".format(i) for i in range(10)] + [" "]
+        ckpt_content = "".join(ckpt_lines)
         temp_dir = self._CreateDeepS3Structure(ckpt_content=ckpt_content)
         ckpt_path = self._PathJoin(temp_dir, "model.ckpt")
         with gfile.GFile(ckpt_path, "r") as f:
@@ -193,7 +191,7 @@ def testReadWithOffset(self):
     def testWrite(self):
         temp_dir = self._CreateDeepS3Structure()
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz"
+        ckpt_content = "asdfasdfasdffoobarbuzz"
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with gfile.GFile(ckpt_path, "r") as f:
@@ -204,9 +202,9 @@ def testWrite(self):
     def testOverwrite(self):
         temp_dir = self._CreateDeepS3Structure()
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz"
+        ckpt_content = "asdfasdfasdffoobarbuzz"
         with gfile.GFile(ckpt_path, "w") as f:
-            f.write(u"original")
+            f.write("original")
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with gfile.GFile(ckpt_path, "r") as f:
@@ -217,7 +215,7 @@ def testOverwrite(self):
     def testWriteMultiple(self):
         temp_dir = self._CreateDeepS3Structure()
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz" * 5
+        ckpt_content = "asdfasdfasdffoobarbuzz" * 5
         with gfile.GFile(ckpt_path, "w") as f:
             for i in range(0, len(ckpt_content), 3):
                 f.write(ckpt_content[i : i + 3])
@@ -232,7 +230,7 @@ def testWriteMultiple(self):
     def testWriteEmpty(self):
         temp_dir = self._CreateDeepS3Structure()
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u""
+        ckpt_content = ""
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with gfile.GFile(ckpt_path, "r") as f:

tensorboard/compat/tensorflow_stub/io/gfile_test.py

@@ -151,15 +151,15 @@ def testReadLines(self):
         # the underlying byte offsets (counting \r).  Multibyte characters would
         # similarly cause desynchronization.
         raw_ckpt_lines = (
-            [u"\r\n"] + [u"line {}\r\n".format(i) for i in range(10)] + [u" "]
+            ["\r\n"] + ["line {}\r\n".format(i) for i in range(10)] + [" "]
         )
         expected_ckpt_lines = (  # without \r
-            [u"\n"] + [u"line {}\n".format(i) for i in range(10)] + [u" "]
+            ["\n"] + ["line {}\n".format(i) for i in range(10)] + [" "]
         )
         # Write out newlines as given (i.e., \r\n) regardless of OS, so as to
         # test translation on read.
         with io.open(ckpt_path, "w", newline="") as f:
-            data = u"".join(raw_ckpt_lines)
+            data = "".join(raw_ckpt_lines)
             f.write(data)
         with gfile.GFile(ckpt_path, "r") as f:
             f.buff_chunk_size = 4  # Test buffering by reducing chunk size
@@ -194,7 +194,7 @@ def testWrite(self):
         temp_dir = self.get_temp_dir()
         self._CreateDeepDirectoryStructure(temp_dir)
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz"
+        ckpt_content = "asdfasdfasdffoobarbuzz"
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with open(ckpt_path, "r") as f:
@@ -205,9 +205,9 @@ def testOverwrite(self):
         temp_dir = self.get_temp_dir()
         self._CreateDeepDirectoryStructure(temp_dir)
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz"
+        ckpt_content = "asdfasdfasdffoobarbuzz"
         with gfile.GFile(ckpt_path, "w") as f:
-            f.write(u"original")
+            f.write("original")
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with open(ckpt_path, "r") as f:
@@ -218,7 +218,7 @@ def testWriteMultiple(self):
         temp_dir = self.get_temp_dir()
         self._CreateDeepDirectoryStructure(temp_dir)
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u"asdfasdfasdffoobarbuzz" * 5
+        ckpt_content = "asdfasdfasdffoobarbuzz" * 5
         with gfile.GFile(ckpt_path, "w") as f:
             for i in range(0, len(ckpt_content), 3):
                 f.write(ckpt_content[i : i + 3])
@@ -233,7 +233,7 @@ def testWriteEmpty(self):
         temp_dir = self.get_temp_dir()
         self._CreateDeepDirectoryStructure(temp_dir)
         ckpt_path = os.path.join(temp_dir, "model2.ckpt")
-        ckpt_content = u""
+        ckpt_content = ""
         with gfile.GFile(ckpt_path, "w") as f:
             f.write(ckpt_content)
         with open(ckpt_path, "r") as f:

tensorboard/data/dispatching_provider_test.py

@@ -74,7 +74,7 @@ def read_scalars(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         self._validate_eid(experiment_id)
         if run_tag_filter is None:
@@ -113,7 +113,7 @@ def read_tensors(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         raise NotImplementedError()
 
@@ -143,7 +143,7 @@ def read_blob_sequences(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         self._validate_eid(experiment_id)
         if run_tag_filter is None:

tensorboard/data/grpc_provider.py

@@ -103,7 +103,7 @@ def read_scalars(
         experiment_id,
         plugin_name,
         downsample=None,
-        run_tag_filter=None
+        run_tag_filter=None,
     ):
         with timing.log_latency("build request"):
             req = data_provider_pb2.ReadScalarsRequest()