Wrap long lines

Also revert an useless change

Author: vstinner

Lib/test/test_codecs.py

@@ -4097,12 +4097,15 @@ def check_encode_strings(self, errors):
                         with self.assertRaises(ValueError) as cm:
                             self.encode_locale(text)
                         errmsg = str(cm.exception)
-                        self.assertRegex(errmsg, f"Py_EncodeLocale failed: error_pos={error_pos}")
+                        regex = f"Py_EncodeLocale failed: error_pos={error_pos}"
+                        self.assertRegex(errmsg, regex)
 
                     with self.assertRaises(RuntimeError) as cm:
                         self.encode_locale_ex(text, errors)
                     errmsg = str(cm.exception)
-                    self.assertRegex(errmsg, f"encode error: pos={error_pos}, reason=encoding error")
+                    regex = (f"encode error: pos={error_pos}, "
+                             "reason=encoding error")
+                    self.assertRegex(errmsg, regex)
                 else:
                     if errors in ("strict", "surrogateescape"):
                         encoded = self.encode_locale(text)

Objects/unicodeobject.c

@@ -5700,7 +5700,7 @@ _Py_EncodeUTF8Ex(const wchar_t *text, char **str, size_t *output_length,
         else if (Py_UNICODE_IS_SURROGATE(ch) && !surrogatepass) {
             /* surrogateescape error handler */
             if (!surrogateescape || !(0xDC80 <= ch && ch <= 0xDCFF)) {
-                if (error_pos) {
+                if (error_pos != NULL) {
                     *error_pos = (size_t)ch_pos;
                 }
                 if (raw_malloc) {