bpo-36582: Make collections.UserString.encode() return bytes, not str (GH-13138)

1 files changed, 4 insertions, 6 deletions

diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 6a3e599..859b846 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -1184,12 +1184,10 @@ class UserString(_collections_abc.Sequence):
         if isinstance(sub, UserString):
             sub = sub.data
         return self.data.count(sub, start, end)
-    def encode(self, encoding=None, errors=None): # XXX improve this?
-        if encoding:
-            if errors:
-                return self.__class__(self.data.encode(encoding, errors))
-            return self.__class__(self.data.encode(encoding))
-        return self.__class__(self.data.encode())
+    def encode(self, encoding='utf-8', errors='strict'):
+        encoding = 'utf-8' if encoding is None else encoding
+        errors = 'strict' if errors is None else errors
+        return self.data.encode(encoding, errors)
     def endswith(self, suffix, start=0, end=_sys.maxsize):
         return self.data.endswith(suffix, start, end)
     def expandtabs(self, tabsize=8):