Remove super() with args

As well as some related format change, removing unimported.

Bug: chromium:1408280
Change-Id: I6ae08c2d1244e3ed005ff0cbb0a33b2d07602363
Reviewed-on: https://chromium-review.googlesource.com/c/catapult/+/4185396
Reviewed-by: Sean McCullough <[email protected]>
Commit-Queue: Funing Wang <[email protected]>

catapult_build/run_with_typ.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

catapult_build/test_runner.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

common/bin/run_tests

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

common/bin/update_chrome_reference_binaries.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be

common/py_trace_event/bin/run_tests

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

common/py_trace_event/py_trace_event/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

common/py_trace_event/py_trace_event/trace_event_impl/multiprocessing_shim.py

@@ -12,10 +12,11 @@
 
 class ProcessSubclass(_RealProcess):
   def __init__(self, shim, *args, **kwards):
+    multiprocessing.get_context("forkserver")
     _RealProcess.__init__(self, *args, **kwards)
     self._shim = shim
 
-  def run(self,*args,**kwargs):
+  def run(self, *args, **kwargs):
     from . import log
     log._disallow_tracing_control()
     try:

common/py_trace_event/py_trace_event/trace_event_unittest.py

@@ -33,6 +33,10 @@ def _test_trace(self, disable=True, format=None):
         if disable:
           trace_event.trace_disable()
 
+  def child(resp):
+    # test tracing is not controllable in the child
+    resp.put(trace_event.is_tracing_controllable())
+
   def testNoImpl(self):
     orig_impl = trace_event.trace_event_impl
     try:
@@ -396,14 +400,12 @@ def child_function():
         self.assertEquals(parent_close['ph'], 'E')
 
   @unittest.skipIf(sys.platform == 'win32', 'crbug.com/945819')
+  @unittest.skipIf(sys.version_info[0] == 3, 'Python3 pickle issue')
+  # TODO: Upgrade PY3 version and activate it
   def testTracingControlDisabledInChildButNotInParent(self):
-    def child(resp):
-      # test tracing is not controllable in the child
-      resp.put(trace_event.is_tracing_controllable())
-
     with self._test_trace():
       q = multiprocessing.Queue()
-      p = multiprocessing.Process(target=child, args=[q])
+      p = multiprocessing.Process(target=self.child, args=[q])
       p.start()
       # test tracing is controllable in the parent
       self.assertTrue(trace_event.is_tracing_controllable())

common/py_utils/bin/run_tests

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

common/py_utils/py_utils/cloud_storage.py

@@ -80,19 +80,15 @@ def _GetConfigInstructions():
 class PermissionError(CloudStorageError):
 
   def __init__(self):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(PermissionError, self).__init__(
+    super().__init__(
         'Attempted to access a file from Cloud Storage but you don\'t '
         'have permission. ' + self._GetConfigInstructions())
 
 
 class CredentialsError(CloudStorageError):
 
   def __init__(self):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(CredentialsError, self).__init__(
+    super().__init__(
         'Attempted to access a file from Cloud Storage but you have no '
         'configured credentials. ' + self._GetConfigInstructions())
 

common/py_utils/py_utils/cloud_storage_unittest.py

@@ -288,16 +288,12 @@ def CleanTimeStampFile():
 class GetIfChangedTests(BaseFakeFsUnitTest):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(GetIfChangedTests, self).setUp()
+    super().setUp()
     self._orig_read_hash = cloud_storage.ReadHash
     self._orig_calculate_hash = cloud_storage.CalculateHash
 
   def tearDown(self):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(GetIfChangedTests, self).tearDown()
+    super().tearDown()
     cloud_storage.CalculateHash = self._orig_calculate_hash
     cloud_storage.ReadHash = self._orig_read_hash
 

common/py_utils/py_utils/refactor/annotated_symbol/base_symbol.py

@@ -13,26 +13,20 @@
 
 class AnnotatedSymbol(snippet.Symbol):
   def __init__(self, symbol_type, children):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AnnotatedSymbol, self).__init__(symbol_type, children)
+    super().__init__(symbol_type, children)
     self._modified = False
 
   @property
   def modified(self):
     if self._modified:
       return True
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    return super(AnnotatedSymbol, self).modified
+    return super().modified
 
   def __setattr__(self, name, value):
     if (hasattr(self.__class__, name) and
         isinstance(getattr(self.__class__, name), property)):
       self._modified = True
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    return super(AnnotatedSymbol, self).__setattr__(name, value)
+    return super().__setattr__(name, value)
 
   def Cut(self, child):
     for i in range(len(self._children)):

common/py_utils/py_utils/refactor/annotated_symbol/reference.py

@@ -47,9 +47,7 @@ def Annotate(cls, nodes):
     return [cls(nodes[:i])] + nodes[i:]
 
   def __init__(self, children):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(Reference, self).__init__(-1, children)
+    super().__init__(-1, children)
 
   @property
   def type_name(self):

common/py_utils/py_utils/slots_metaclass_unittest.py

@@ -30,9 +30,7 @@ class NaughtyClass2(NiceClass):
         __slots__ = ()
 
         def __init__(self, naughty):
-          # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-          # pylint: disable=super-with-arguments
-          super(NaughtyClass2, self).__init__(42)
+          super().__init__(42)
           self._naughty = naughty  # pylint: disable=assigning-non-slot
 
       # SlotsMetaclass is happy that __slots__ is defined, but python won't be

common/py_utils/py_utils/test_data/discoverable_classes/another_discover_dummyclass.py

@@ -30,7 +30,5 @@ def __init__(self):
 
 class DummyExceptionWithParameterImpl1(_PrivateDummyException):
   def __init__(self, parameter):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(DummyExceptionWithParameterImpl1, self).__init__()
+    super().__init__()
     del parameter

common/py_utils/py_utils/test_data/discoverable_classes/parameter_discover_dummyclass.py

@@ -8,7 +8,5 @@
 
 class DummyExceptionWithParameterImpl2(discover_dummyclass.DummyException):
   def __init__(self, parameter1, parameter2):
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(DummyExceptionWithParameterImpl2, self).__init__()
+    super().__init__()
     del parameter1, parameter2

common/py_utils/py_utils/webpagereplay_go_server.py

@@ -48,9 +48,7 @@ def __init__(self, label, path):
       path: A string of the path in this error.
 
     """
-    # TODO(https://crbug.com/1262295): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(ReplayNotFoundError, self).__init__()
+    super().__init__()
     self.args = (label, path)
 
   def __str__(self):

common/py_vulcanize/bin/run_py_tests

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

dashboard/bq_export/bq_export/split_by_timestamp.py

@@ -48,9 +48,7 @@ def __init__(self,
       :timestamp_property: a str of the name of the timestamp property to filter
           on.
     """
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(ReadTimestampRangeFromDatastore, self).__init__()
+    super().__init__()
     self._query_params = query_params
     self._time_range_provider = time_range_provider
     self._step = step
@@ -71,9 +69,7 @@ def expand(self, pcoll):  # pylint: disable=invalid-name
   class _QueryFn(beam.DoFn):
 
     def __init__(self, query_params, timestamp_property):
-      # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-      # pylint: disable=super-with-arguments
-      super(ReadTimestampRangeFromDatastore._QueryFn, self).__init__()
+      super().__init__()
       self._query_params = query_params
       self._timestamp_property = timestamp_property
 

dashboard/dashboard/add_histograms_queue_test.py

@@ -10,9 +10,6 @@
 from flask import Flask
 import json
 import mock
-import six
-if six.PY2:
-  import webapp2
 import sys
 import uuid
 import webtest
@@ -89,17 +86,8 @@ def AddHistogramsQueuePost():
 class AddHistogramsQueueTest(testing_common.TestCase):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AddHistogramsQueueTest, self).setUp()
-    if six.PY2:
-      app = webapp2.WSGIApplication([
-          ('/add_histograms_queue',
-           add_histograms_queue.AddHistogramsQueueHandler)
-      ])
-      self.testapp = webtest.TestApp(app)
-    else:
-      self.testapp = webtest.TestApp(flask_app)
+    super().setUp()
+    self.testapp = webtest.TestApp(flask_app)
     self.SetCurrentUser('[email protected]', is_admin=True)
 
   def testPostHistogram(self):
@@ -633,17 +621,8 @@ def testCreateRowEntities_DoesNotAddTraceUriIfDiagnosticIsEmpty(self):
 class AddHistogramsQueueTestWithUploadCompletionToken(testing_common.TestCase):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AddHistogramsQueueTestWithUploadCompletionToken, self).setUp()
-    if six.PY2:
-      app = webapp2.WSGIApplication([
-          ('/add_histograms_queue',
-           add_histograms_queue.AddHistogramsQueueHandler)
-      ])
-      self.testapp = webtest.TestApp(app)
-    else:
-      self.testapp = webtest.TestApp(flask_app)
+    super().setUp()
+    self.testapp = webtest.TestApp(flask_app)
     testing_common.SetIsInternalUser('[email protected]', True)
     self.SetCurrentUser('[email protected]')
 

dashboard/dashboard/add_histograms_test.py

@@ -13,8 +13,6 @@
 import mock
 import random
 import six
-if six.PY2:
-  import webapp2
 import string
 import sys
 import unittest
@@ -192,21 +190,8 @@ def UploadsInfoGet(token_id):
 class AddHistogramsBaseTest(testing_common.TestCase):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AddHistogramsBaseTest, self).setUp()
-    if six.PY2:
-      app = webapp2.WSGIApplication([
-          ('/add_histograms', add_histograms.AddHistogramsHandler),
-          ('/add_histograms/process',
-           add_histograms.AddHistogramsProcessHandler),
-          ('/add_histograms_queue',
-           add_histograms_queue.AddHistogramsQueueHandler),
-          ('/uploads/(.+)', uploads_info.UploadInfoHandler),
-      ])
-      self.testapp = webtest.TestApp(app)
-    else:
-      self.testapp = webtest.TestApp(flask_app)
+    super().setUp()
+    self.testapp = webtest.TestApp(flask_app)
     testing_common.SetIsInternalUser('[email protected]', True)
     self.SetCurrentUser('[email protected]', is_admin=True)
     oauth_patcher = mock.patch.object(api_auth, 'oauth')
@@ -1645,10 +1630,7 @@ def testLogDebugInfo_NoLogUrls(self, mock_log):
 class AddHistogramsUploadCompleteonTokenTest(AddHistogramsBaseTest):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AddHistogramsUploadCompleteonTokenTest, self).setUp()
-
+    super().setUp()
     self._TrunOnUploadCompletionTokenExperiment()
     hs = _CreateHistogram(
         master='master',

dashboard/dashboard/add_point_queue_test.py

@@ -17,9 +17,7 @@
 class GetOrCreateAncestorsTest(testing_common.TestCase):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(GetOrCreateAncestorsTest, self).setUp()
+    super().setUp()
     self.SetCurrentUser('[email protected]', is_admin=True)
 
   def testGetOrCreateAncestors_GetsExistingEntities(self):

dashboard/dashboard/add_point_test.py

@@ -14,8 +14,6 @@
 
 import mock
 import six
-if six.PY2:
-  import webapp2
 import webtest
 
 from google.appengine.api import datastore_errors
@@ -197,16 +195,8 @@ def AddPointQueuePost():
 class AddPointTest(testing_common.TestCase):
 
   def setUp(self):
-    # TODO(https://crbug.com/1262292): Change to super() after Python2 trybots retire.
-    # pylint: disable=super-with-arguments
-    super(AddPointTest, self).setUp()
-    if six.PY2:
-      app = webapp2.WSGIApplication([('/add_point', add_point.AddPointHandler),
-                                     ('/add_point_queue',
-                                      add_point_queue.AddPointQueueHandler)])
-      self.testapp = webtest.TestApp(app)
-    else:
-      self.testapp = webtest.TestApp(flask_app)
+    super().setUp()
+    self.testapp = webtest.TestApp(flask_app)
     units_to_direction.UpdateFromJson(_UNITS_TO_DIRECTION_DICT)
     self.SetCurrentUser(
         '[email protected]', is_admin=True)