From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 25 Dec 2014 02:24:07 +0000 (-0500)
Subject: Merge: #23040: Clarify treatment of encoding and errors when component is bytes.
X-Git-Tag: v3.5.0a1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ab6ba474410b2f49d3a76766999effa59875024;p=python

Merge: #23040: Clarify treatment of encoding and errors when component is bytes.
---

3ab6ba474410b2f49d3a76766999effa59875024