fixup: Formatting fixes, simplify test

Author: cmaloney

Lib/test/test_io/test_textio.py

@@ -1568,19 +1568,19 @@ def test_reentrant_detach_during_flush(self):
         # gh-143008: Reentrant detach() during flush should raise RuntimeError
         # instead of crashing.
         wrapper = None
-        wrapper_ref = None
+        wrapper_ref = lambda: None
 
         class EvilBuffer(self.BufferedRandom):
             detach_on_write = False
 
             def flush(self):
-                wrapper = wrapper_ref() if wrapper_ref is not None else None
+                wrapper = wrapper_ref()
                 if wrapper is not None and not self.detach_on_write:
                     wrapper.detach()
                 return super().flush()
 
             def write(self, b):
-                wrapper = wrapper_ref() if wrapper_ref is not None else None
+                wrapper = wrapper_ref()
                 if wrapper is not None and self.detach_on_write:
                     wrapper.detach()
                 return len(b)
@@ -1598,10 +1598,9 @@ def write(self, b):
             with self.subTest(name), set_recursion_limit(100):
                 wrapper = self.TextIOWrapper(EvilBuffer(self.MockRawIO()), encoding='utf-8')
                 wrapper_ref = weakref.ref(wrapper)
-                # These used to crash; now either return detached or keep
-                # running until out of stack.
-                self.assertRaises((RecursionError, RuntimeError), method)
-                wrapper_ref = None
+                # Used to crash; now will run out of stack.
+                self.assertRaises(RecursionError, method)
+                wrapper_ref = lambda: None
                 del wrapper
 
         with self.subTest('read via writeflush'):
@@ -1610,7 +1609,7 @@ def write(self, b):
             wrapper_ref = weakref.ref(wrapper)
             wrapper.write('x')
             self.assertRaisesRegex(ValueError, "detached", wrapper.read)
-            wrapper_ref = None
+            wrapper_ref = lambda: None
             del wrapper
 
 

Modules/_io/textio.c

@@ -1052,7 +1052,7 @@ _textiowrapper_fix_encoder_state(textio *self)
     self->encoding_start_of_stream = 1;
 
     PyObject *cookieObj = _textiowrapper_buffer_callmethod_noargs(
-            self, &_Py_ID(tell));
+        self, &_Py_ID(tell));
     if (cookieObj == NULL) {
         return -1;
     }
@@ -1970,8 +1970,8 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
         goto fail;
 
     input_chunk = _textiowrapper_buffer_callmethod_onearg(self,
-            (self->has_read1 ? &_Py_ID(read1): &_Py_ID(read)),
-            chunk_size);
+        (self->has_read1 ? &_Py_ID(read1): &_Py_ID(read)),
+        chunk_size);
     Py_DECREF(chunk_size);
     if (input_chunk == NULL)
         goto fail;
@@ -2056,7 +2056,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n)
     if (n < 0) {
         /* Read everything */
         PyObject *bytes = _textiowrapper_buffer_callmethod_noargs(self,
-                &_Py_ID(read));
+            &_Py_ID(read));
         PyObject *decoded;
         if (bytes == NULL)
             goto fail;
@@ -2727,7 +2727,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
             goto fail;
         }
         PyObject *input_chunk = _textiowrapper_buffer_callmethod_onearg(self,
-                &_Py_ID(read), bytes_to_feed);
+            &_Py_ID(read), bytes_to_feed);
         Py_DECREF(bytes_to_feed);
 
         PyObject *decoded;
@@ -3219,7 +3219,7 @@ _io_TextIOWrapper_close_impl(textio *self)
         PyObject *exc = NULL;
         if (self->finalizing) {
             res = _textiowrapper_buffer_callmethod_onearg(self,
-                    &_Py_ID(_dealloc_warn), (PyObject *)self);
+                &_Py_ID(_dealloc_warn), (PyObject *)self);
             if (res) {
                 Py_DECREF(res);
             }