@@ -241,7 +241,7 @@ mod _codecs {
                 .as_ref()
                 .is_some_and(|s| s.is(identifier!(vm, surrogatepass)))
         {
-            return Ok((args.str.as_bytes().to_vec(), args.str.byte_len()));
+            return Ok((args.str.as_bytes().to_vec(), args.str.char_len()));
         }
         do_codec!(utf8::encode, args, vm)
     }
 
@@ -21,6 +21,10 @@
 
 import _codecs
 
+# Encoder counts are characters consumed, not the size of the encoded bytes.
+assert _codecs.utf_8_encode("é😀") == (b"\xc3\xa9\xf0\x9f\x98\x80", 2)
+assert _codecs.utf_8_encode("a\ud800b", "surrogatepass") == (b"a\xed\xa0\x80b", 3)
+
 assert _codecs.escape_encode(b"a\tb") == (b"a\\tb", 3)
 assert _codecs.escape_decode(rb"a\tb") == (b"a\tb", 4)
 assert _codecs.utf_16_ex_decode(b"\xff\xfeh\x00i\x00", "strict", 0, True)[0] == "hi"
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ mod _codecs {`
`241`	`241`	`.as_ref()`
`242`	`242`	`.is_some_and(\|s\| s.is(identifier!(vm, surrogatepass)))`
`243`	`243`	`{`
`244`		`- return Ok((args.str.as_bytes().to_vec(), args.str.byte_len()));`
	`244`	`+ return Ok((args.str.as_bytes().to_vec(), args.str.char_len()));`
`245`	`245`	`}`
`246`	`246`	`do_codec!(utf8::encode, args, vm)`
`247`	`247`	`}`