update tests

Author: hauntsaninja

test-data/stdlib-samples/3.2/test/test_base64.py

@@ -248,8 +248,8 @@ def test_encode_file(self) -> None:
         output = self.get_output('-e', support.TESTFN)
         self.assertEqual(output.rstrip(), b'Yf9iCg==')
 
-        with open(support.TESTFN, 'rb') as fp:
-            output = self.get_output('-e', stdin=fp)
+        with open(support.TESTFN, 'rb') as fp2:
+            output = self.get_output('-e', stdin=fp2)
         self.assertEqual(output.rstrip(), b'Yf9iCg==')
 
     def test_decode(self) -> None:

test-data/stdlib-samples/3.2/test/test_genericpath.py

@@ -114,26 +114,21 @@ def test_getsize(self) -> None:
             support.unlink(support.TESTFN)
 
     def test_time(self) -> None:
-        f = open(support.TESTFN, "wb")
-        try:
-            f.write(b"foo")
-            f.close()
-            f = open(support.TESTFN, "ab")
-            f.write(b"bar")
-            f.close()
-            f = open(support.TESTFN, "rb")
-            d = f.read()
-            f.close()
-            self.assertEqual(d, b"foobar")
-
-            self.assertLessEqual(
-                self.pathmodule.getctime(support.TESTFN),
-                self.pathmodule.getmtime(support.TESTFN)
-            )
-        finally:
-            if not f.closed:
-                f.close()
-            support.unlink(support.TESTFN)
+        f1 = open(support.TESTFN, "wb")
+        f1.write(b"foo")
+        f1.close()
+        f2 = open(support.TESTFN, "ab")
+        f2.write(b"bar")
+        f2.close()
+        f3 = open(support.TESTFN, "rb")
+        d = f3.read()
+        f3.close()
+        self.assertEqual(d, b"foobar")
+
+        self.assertLessEqual(
+            self.pathmodule.getctime(support.TESTFN),
+            self.pathmodule.getmtime(support.TESTFN)
+        )
 
     def test_exists(self) -> None:
         self.assertIs(self.pathmodule.exists(support.TESTFN), False)

test-data/unit/pythoneval.test

@@ -271,8 +271,8 @@ f.write('x')
 f.write(b'x')
 f.foobar()
 [out]
-_program.py:3: error: Argument 1 to "write" of "IO" has incompatible type "bytes"; expected "str"
-_program.py:4: error: "TextIO" has no attribute "foobar"
+_program.py:3: error: Argument 1 to "write" of "TextIOBase" has incompatible type "bytes"; expected "str"
+_program.py:4: error: "TextIOWrapper" has no attribute "foobar"
 
 [case testOpenReturnTypeInference]
 reveal_type(open('x'))
@@ -281,9 +281,9 @@ reveal_type(open('x', 'rb'))
 mode = 'rb'
 reveal_type(open('x', mode))
 [out]
-_program.py:1: note: Revealed type is 'typing.TextIO'
-_program.py:2: note: Revealed type is 'typing.TextIO'
-_program.py:3: note: Revealed type is 'typing.BinaryIO'
+_program.py:1: note: Revealed type is 'io.TextIOWrapper'
+_program.py:2: note: Revealed type is 'io.TextIOWrapper'
+_program.py:3: note: Revealed type is 'io.BufferedReader'
 _program.py:5: note: Revealed type is 'typing.IO[Any]'
 
 [case testOpenReturnTypeInferenceSpecialCases]
@@ -292,8 +292,8 @@ reveal_type(open(file='x', mode='rb'))
 mode = 'rb'
 reveal_type(open(mode=mode, file='r'))
 [out]
-_testOpenReturnTypeInferenceSpecialCases.py:1: note: Revealed type is 'typing.BinaryIO'
-_testOpenReturnTypeInferenceSpecialCases.py:2: note: Revealed type is 'typing.BinaryIO'
+_testOpenReturnTypeInferenceSpecialCases.py:1: note: Revealed type is 'io.BufferedReader'
+_testOpenReturnTypeInferenceSpecialCases.py:2: note: Revealed type is 'io.BufferedReader'
 _testOpenReturnTypeInferenceSpecialCases.py:4: note: Revealed type is 'typing.IO[Any]'
 
 [case testPathOpenReturnTypeInference]