test: Add pyupgrade and fix syntax

Author: andrewferrier

.pre-commit-config.yaml

@@ -16,3 +16,7 @@ repos:
       rev: 3.0.3
       hooks:
           - id: editorconfig-checker
+    - repo: https://github.com/asottile/pyupgrade
+      rev: v3.17.0
+      hooks:
+          - id: pyupgrade

tests/BaseTestClasses.py

@@ -159,7 +159,7 @@ def writeFile(self, fname, contents):
             filename.write(contents)
 
     def readFile(self, fname):
-        with open(fname, 'r') as filename:
+        with open(fname) as filename:
             return filename.read()
 
     def assertPathDoesntExist(self, path):

tests/Direct/test_Direct_Arguments.py

@@ -5,7 +5,7 @@
 
 class TestDirectArguments(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestDirectArguments, self).setUp()
+        super().setUp()
 
     def test_targetfile_exists_with_force(self):
         filename = os.path.join(self.workingDir, 'blah.txt')

tests/Direct/test_Direct_Basic.py

@@ -6,7 +6,7 @@
 
 class TestDirectBasic(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestDirectBasic, self).setUp()
+        super().setUp()
 
     def test_basicdateprefix(self):
         filename = os.path.join(self.workingDir, 'blah.txt')

tests/Direct/test_Direct_Errors.py

@@ -6,7 +6,7 @@
 
 class TestDirectErrors(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestDirectErrors, self).setUp()
+        super().setUp()
 
     def test_file_not_exist(self):
         filename = os.path.join(self.workingDir, 'blah.txt')

tests/Direct/test_Direct_FrozenTime.py

@@ -7,7 +7,7 @@
 
 class TestDirectFrozenTime(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestDirectFrozenTime, self).setUp()
+        super().setUp()
 
     @freeze_time("2015-02-03 10:11:12")
     def test_basicdateprefix(self):

tests/Subprocess/test_Subprocess_Arguments.py

@@ -5,7 +5,7 @@
 
 class TestSubprocessArguments(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestSubprocessArguments, self).setUp()
+        super().setUp()
 
     def test_no_basicdateprefix(self):
         (rc, output, error) = self.invokeAsSubprocess([], extraParams=['--help'], expectOutput=True)

tests/Subprocess/test_Subprocess_Basic.py

@@ -6,7 +6,7 @@
 
 class TestSubprocessBasic(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestSubprocessBasic, self).setUp()
+        super().setUp()
 
     def test_basicdateprefix(self):
         filename = os.path.join(self.workingDir, 'blah.txt')

tests/Subprocess/test_Subprocess_Errors.py

@@ -3,7 +3,7 @@
 
 class TestSubprocessErrors(NormalizeFilenameTestCase):
     def setUp(self):
-        super(TestSubprocessErrors, self).setUp()
+        super().setUp()
 
     def test_no_files(self):
         (rc, output, error) = self.invokeAsSubprocess([], expectOutput=True)