Merge lp:~jelmer/brz/no-safe-unicode into lp:brz/3.3

[Jelmer Vernooij]

Drop safe_unicode and safe_utf8.

Drop safe_unicode and safe_utf8.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/72/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/73/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/74/

[Jelmer Vernooij (jelmer)]

review: Approve

Unmerged revisions

7569. By Jelmer Vernooij on 2021-12-25

Avoid safe_* in cython.

7568. By Jelmer Vernooij on 2021-12-25

Drop safe_unicode.

=== modified file 'breezy/_walkdirs_win32.pyx'
--- breezy/_walkdirs_win32.pyx	2020-06-08 19:42:53 +0000
+++ breezy/_walkdirs_win32.pyx	2022-10-27 08:09:03 +0000
@@ -187,11 +187,8 @@
 
     def top_prefix_to_starting_dir(self, top, prefix=""):
         """See DirReader.top_prefix_to_starting_dir."""
-        global osutils
-        if osutils is None:
-            from . import osutils
-        return (osutils.safe_utf8(prefix), None, None, None,
-                osutils.safe_unicode(top))
+        return (prefix.encode('utf-8'), None, None, None,
+                top.decnde('utf-8'))
 
     cdef object _get_kind(self, WIN32_FIND_DATAW *data):
         if data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY:

=== modified file 'breezy/bzr/tests/per_versionedfile.py'
--- breezy/bzr/tests/per_versionedfile.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/tests/per_versionedfile.py	2022-10-27 08:09:03 +0000
@@ -249,10 +249,10 @@
         # unicode content is not permitted in versioned files.
         # versioned files version sequences of bytes only.
         vf = self.get_file()
-        self.assertRaises(errors.BzrBadParameterUnicode,
+        self.assertRaises(TypeError,
                           vf.add_lines, b'a', [], [b'a\n', u'b\n', b'c\n'])
         self.assertRaises(
-            (errors.BzrBadParameterUnicode, NotImplementedError),
+            (TypeError, NotImplementedError),
             vf.add_lines_with_ghosts, b'a', [], [b'a\n', u'b\n', b'c\n'])
 
     def test_add_follows_left_matching_blocks(self):
@@ -275,10 +275,10 @@
     def test_inline_newline_throws(self):
         # \r characters are not permitted in lines being added
         vf = self.get_file()
-        self.assertRaises(errors.BzrBadParameterContainsNewline,
+        self.assertRaises(ValueError,
                           vf.add_lines, b'a', [], [b'a\n\n'])
         self.assertRaises(
-            (errors.BzrBadParameterContainsNewline, NotImplementedError),
+            (ValueError, NotImplementedError),
             vf.add_lines_with_ghosts, b'a', [], [b'a\n\n'])
         # but inline CR's are allowed
         vf.add_lines(b'a', [], [b'a\r\n'])

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2022-09-08 14:15:34 +0000
+++ breezy/bzr/versionedfile.py	2022-10-27 08:09:03 +0000
@@ -556,13 +556,13 @@
         """Check that lines being added to a versioned file are not unicode."""
         for line in lines:
             if not isinstance(line, bytes):
-                raise errors.BzrBadParameterUnicode("lines")
+                raise TypeError(lines)
 
     def _check_lines_are_lines(self, lines):
         """Check that the lines really are full lines without inline EOL."""
         for line in lines:
             if b'\n' in line[:-1]:
-                raise errors.BzrBadParameterContainsNewline("lines")
+                raise ValueError(lines)
 
     def get_format_signature(self):
         """Get a text description of the data encoding in this file.
@@ -1177,13 +1177,13 @@
         """Check that lines being added to a versioned file are not unicode."""
         for line in lines:
             if line.__class__ is not bytes:
-                raise errors.BzrBadParameterUnicode("lines")
+                raise TypeError(lines)
 
     def _check_lines_are_lines(self, lines):
         """Check that the lines really are full lines without inline EOL."""
         for line in lines:
             if b'\n' in line[:-1]:
-                raise errors.BzrBadParameterContainsNewline("lines")
+                raise ValueError(lines)
 
     def get_known_graph_ancestry(self, keys):
         """Get a KnownGraph instance with the ancestry of keys."""

=== modified file 'breezy/bzr/workingtree_3.py'
--- breezy/bzr/workingtree_3.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/workingtree_3.py	2022-10-27 08:09:03 +0000
@@ -80,8 +80,7 @@
                 #       warning might be sufficient to let the user know what
                 #       is going on.
                 trace.mutter('Could not write hashcache for %s\nError: %s',
-                             self._hashcache.cache_file_name(),
-                             osutils.safe_unicode(e.args[1]))
+                             self._hashcache.cache_file_name(), e.args[1])
 
     def get_file_sha1(self, path, stat_value=None):
         with self.lock_read():

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2022-08-22 18:19:46 +0000
+++ breezy/bzr/workingtree_4.py	2022-10-27 08:09:03 +0000
@@ -71,7 +71,6 @@
     isdir,
     pathjoin,
     realpath,
-    safe_unicode,
     )
 from ..transport import get_transport_from_path, NoSuchFile
 from ..transport.local import LocalTransport
@@ -105,7 +104,7 @@
         """
         self._format = _format
         self.controldir = _controldir
-        basedir = safe_unicode(basedir)
+        basedir = basedir.decode('utf-8') if isinstance(basedir, bytes) else basedir
         trace.mutter("opening working tree %r", basedir)
         self._branch = branch
         self.basedir = realpath(basedir)
@@ -1395,13 +1394,13 @@
     def sha1(self, abspath):
         """See dirstate.SHA1Provider.sha1()."""
         filters = self.tree._content_filter_stack(
-            self.tree.relpath(osutils.safe_unicode(abspath)))
+            self.tree.relpath(abspath))
         return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
 
     def stat_and_sha1(self, abspath):
         """See dirstate.SHA1Provider.stat_and_sha1()."""
         filters = self.tree._content_filter_stack(
-            self.tree.relpath(osutils.safe_unicode(abspath)))
+            self.tree.relpath(abspath))
         with open(abspath, 'rb', 65000) as file_obj:
             statvalue = os.fstat(file_obj.fileno())
             if filters:

=== modified file 'breezy/config.py'
--- breezy/config.py	2022-09-01 19:17:39 +0000
+++ breezy/config.py	2022-10-27 08:09:03 +0000
@@ -968,7 +968,7 @@
 
     def __init__(self, file_name):
         super(LockableConfig, self).__init__(file_name=file_name)
-        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
+        self.dir = osutils.dirname(self.file_name)
         # FIXME: It doesn't matter that we don't provide possible_transports
         # below since this is currently used only for local config files ;
         # local transports are not shared. But if/when we start using

=== modified file 'breezy/email_message.py'
--- breezy/email_message.py	2020-02-18 01:57:45 +0000
+++ breezy/email_message.py	2022-10-27 08:09:03 +0000
@@ -22,8 +22,6 @@
 from email.mime.text import MIMEText
 from email.utils import formataddr, parseaddr
 from . import __version__ as _breezy_version
-from .errors import BzrBadParameterNotUnicode
-from .osutils import safe_unicode
 from .smtp_connection import SMTPConnection
 
 
@@ -66,7 +64,7 @@
 
         self._headers['To'] = ', '.join(to_addresses)
         self._headers['From'] = self.address_to_encoded_header(from_address)
-        self._headers['Subject'] = Header(safe_unicode(subject))
+        self._headers['Subject'] = Header(subject)
         self._headers['User-Agent'] = 'Bazaar (%s)' % _breezy_version
 
     def add_inline_attachment(self, body, filename=None, mime_subtype='plain'):
@@ -167,15 +165,14 @@
         :return: A possibly RFC2047-encoded string.
         """
         if not isinstance(address, str):
-            raise BzrBadParameterNotUnicode(address)
+            raise TypeError(address)
         # Can't call Header over all the address, because that encodes both the
         # name and the email address, which is not permitted by RFCs.
         user, email = parseaddr(address)
         if not user:
             return email
         else:
-            return formataddr((str(Header(safe_unicode(user))),
-                               email))
+            return formataddr((str(Header(user)), email))
 
     @staticmethod
     def string_with_encoding(string_):

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2022-08-22 18:19:46 +0000
+++ breezy/errors.py	2022-10-27 08:09:03 +0000
@@ -1378,23 +1378,6 @@
         self.prefix = prefix
 
 
-class BzrBadParameter(InternalBzrError):
-
-    _fmt = "Bad parameter: %(param)r"
-
-    # This exception should never be thrown, but it is a base class for all
-    # parameter-to-function errors.
-
-    def __init__(self, param):
-        BzrError.__init__(self)
-        self.param = param
-
-
-class BzrBadParameterNotUnicode(BzrBadParameter):
-
-    _fmt = "Parameter %(param)s is neither unicode nor utf8."
-
-
 class BzrMoveFailedError(BzrError):
 
     _fmt = ("Could not move %(from_path)s%(operator)s %(to_path)s"
@@ -1440,27 +1423,6 @@
         BzrMoveFailedError.__init__(self, from_path, to_path, extra)
 
 
-class BzrBadParameterNotString(BzrBadParameter):
-
-    _fmt = "Parameter %(param)s is not a string or unicode string."
-
-
-class BzrBadParameterMissing(BzrBadParameter):
-
-    _fmt = "Parameter %(param)s is required but not present."
-
-
-class BzrBadParameterUnicode(BzrBadParameter):
-
-    _fmt = ("Parameter %(param)s is unicode but"
-            " only byte-strings are permitted.")
-
-
-class BzrBadParameterContainsNewline(BzrBadParameter):
-
-    _fmt = "Parameter %(param)s contains a newline."
-
-
 class ParamikoNotPresent(DependencyNotPresent):
 
     _fmt = "Unable to import paramiko (required for sftp support): %(error)s"

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2022-08-28 18:54:11 +0000
+++ breezy/git/branch.py	2022-10-27 08:09:03 +0000
@@ -1211,8 +1211,9 @@
                     raise errors.DivergedBranches(self.source, self.target)
             refs = {self.target.ref: new_ref}
             result.new_revid = stop_revision
-            for name, sha in (
+            for utf8_name, sha in (
                     self.source.repository._git.refs.as_dict(b"refs/tags").items()):
+                name = utf8_name.decode('utf-8')
                 if tag_selector and not tag_selector(name):
                     continue
                 if sha not in self.source.repository._git:

=== modified file 'breezy/git/fetch.py'
--- breezy/git/fetch.py	2022-08-22 18:19:46 +0000
+++ breezy/git/fetch.py	2022-10-27 08:09:03 +0000
@@ -259,7 +259,7 @@
         # If nothing has changed since the base revision, we're done
         return [], {}
     invdelta = []
-    file_id = lookup_file_id(osutils.safe_unicode(path))
+    file_id = lookup_file_id(path)
     ie = InventoryDirectory(file_id, decode_git_path(name), parent_id)
     tree = lookup_object(hexsha)
     if base_hexsha is None:

=== modified file 'breezy/git/refs.py'
--- breezy/git/refs.py	2022-07-15 13:59:24 +0000
+++ breezy/git/refs.py	2022-10-27 08:09:03 +0000
@@ -60,7 +60,7 @@
     return ret
 
 
-def branch_name_to_ref(name):
+def branch_name_to_ref(name: str) -> bytes:
     """Map a branch name to a ref.
 
     :param name: Branch name
@@ -69,18 +69,18 @@
     if name == "":
         return b"HEAD"
     if not name.startswith("refs/"):
-        return LOCAL_BRANCH_PREFIX + osutils.safe_utf8(name)
+        return LOCAL_BRANCH_PREFIX + name.encode('utf-8')
     else:
-        return osutils.safe_utf8(name)
-
-
-def tag_name_to_ref(name):
+        return name.encode('utf-8')
+
+
+def tag_name_to_ref(name: str) -> bytes:
     """Map a tag name to a ref.
 
     :param name: Tag name
     :return: ref string
     """
-    return LOCAL_TAG_PREFIX + osutils.safe_utf8(name)
+    return LOCAL_TAG_PREFIX + name.encode('utf-8')
 
 
 def ref_to_branch_name(ref):

=== modified file 'breezy/git/roundtrip.py'
--- breezy/git/roundtrip.py	2020-02-18 01:57:45 +0000
+++ breezy/git/roundtrip.py	2022-10-27 08:09:03 +0000
@@ -117,7 +117,7 @@
                      b" ".join(metadata.explicit_parent_ids))
     for key in sorted(metadata.properties.keys()):
         for l in metadata.properties[key].split(b"\n"):
-            lines.append(b"property-%s: %s\n" % (key, osutils.safe_utf8(l)))
+            lines.append(b"property-%s: %s\n" % (key, l))
     if b"testament3-sha1" in metadata.verifiers:
         lines.append(b"testament3-sha1: %s\n" %
                      metadata.verifiers[b"testament3-sha1"])

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-09-14 13:52:36 +0000
+++ breezy/git/tests/test_remote.py	2022-10-27 08:09:03 +0000
@@ -775,7 +775,7 @@
 
         remote = ControlDir.open(self.remote_url)
         remote.open_branch().tags.set_tag(
-            b'blah', default_mapping.revision_id_foreign_to_bzr(c1))
+            'blah', default_mapping.revision_id_foreign_to_bzr(c1))
         self.assertEqual(
             self.remote_real.get_refs(),
             {b'refs/heads/master': self.remote_real.head(),

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2022-10-02 16:57:16 +0000
+++ breezy/git/tree.py	2022-10-27 08:09:03 +0000
@@ -412,7 +412,7 @@
             return None
         if not self.is_versioned(path):
             return None
-        return self.mapping.generate_file_id(osutils.safe_unicode(path))
+        return self.mapping.generate_file_id(path)
 
     def all_versioned_paths(self):
         ret = {u''}
@@ -1172,8 +1172,7 @@
         with self.lock_read():
             path = path.rstrip('/')
             if self.is_versioned(path.rstrip('/')):
-                return self.mapping.generate_file_id(
-                    osutils.safe_unicode(path))
+                return self.mapping.generate_file_id(path)
             return None
 
     def _set_root_id(self, file_id):

=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2022-05-15 14:17:32 +0000
+++ breezy/gpg.py	2022-10-27 08:09:03 +0000
@@ -239,7 +239,7 @@
                 'Set create_signatures=no to disable creating signatures.')
 
         if isinstance(content, str):
-            raise errors.BzrBadParameterUnicode('content')
+            raise TypeError(content)
 
         plain_text = gpg.Data(content)
         try:

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2022-09-22 22:55:28 +0000
+++ breezy/osutils.py	2022-10-27 08:09:03 +0000
@@ -1302,6 +1302,7 @@
     return [canonical_relpath(base, p) for p in paths]
 
 
+<<<<<<< TREE
 def safe_unicode(unicode_or_utf8_string):
     """Coerce unicode_or_utf8_string into unicode.
 
@@ -1336,6 +1337,23 @@
     return unicode_or_utf8_string.encode('utf-8')
 
 
+=======
+def decode_filename(filename):
+    """Decode the filename using the filesystem encoding
+
+    If it is unicode, it is returned.
+    Otherwise it is decoded from the the filesystem's encoding. If decoding
+    fails, a errors.BadFilenameEncoding exception is raised.
+    """
+    if isinstance(filename, str):
+        return filename
+    try:
+        return filename.decode(_fs_enc)
+    except UnicodeDecodeError:
+        raise errors.BadFilenameEncoding(filename, _fs_enc)
+
+
+>>>>>>> MERGE-SOURCE
 _platform_normalizes_filenames = False
 if sys.platform == 'darwin':
     _platform_normalizes_filenames = True
@@ -1709,7 +1727,7 @@
     # potentially confusing output. We should make this more robust - but
     # not at a speed cost. RBC 20060731
     _directory = _directory_kind
-    pending = [(safe_unicode(prefix), "", _directory, None, safe_unicode(top))]
+    pending = [(prefix, "", _directory, None, top)]
     while pending:
         # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
         relroot, _, _, _, top = pending.pop()
@@ -1827,7 +1845,8 @@
 
     def top_prefix_to_starting_dir(self, top, prefix=""):
         """See DirReader.top_prefix_to_starting_dir."""
-        return (safe_utf8(prefix), None, None, None, safe_unicode(top))
+        return (prefix.encode('utf-8')
+                if isinstance(prefix, str) else prefix, None, None, None, top)
 
     def read_dir(self, prefix, top):
         """Read a single directory from a non-utf8 file system.
@@ -1852,8 +1871,17 @@
 
         dirblock = []
         append = dirblock.append
+<<<<<<< TREE
         for entry in scandir(safe_utf8(top)):
             name = os.fsdecode(entry.name)
+=======
+        for entry in scandir(_fs_encode(top)):
+            try:
+                name = _fs_decode(entry.name)
+            except UnicodeDecodeError:
+                raise errors.BadFilenameEncoding(
+                    relprefix + entry.name, _fs_enc)
+>>>>>>> MERGE-SOURCE
             abspath = top_slash + name
             name_utf8 = _utf8_encode(name, 'surrogateescape')[0]
             statvalue = entry.stat(follow_symlinks=False)

=== modified file 'breezy/plugins/launchpad/lp_api.py'
--- breezy/plugins/launchpad/lp_api.py	2022-09-07 01:35:37 +0000
+++ breezy/plugins/launchpad/lp_api.py	2022-10-27 08:09:03 +0000
@@ -314,7 +314,7 @@
                                self.lp.bzr_identity)
                     return
                 graph = self.bzr.repository.get_graph()
-                if not graph.is_ancestor(osutils.safe_utf8(self.lp.last_scanned_id),
+                if not graph.is_ancestor(self.lp.last_scanned_id.encode('utf-8'),
                                          self.bzr.last_revision()):
                     raise errors.DivergedBranches(self.bzr, self.push_bzr)
                 trace.note(gettext('Pushing to %s') % self.lp.bzr_identity)

=== modified file 'breezy/plugins/po_merge/tests/test_po_merge.py'
--- breezy/plugins/po_merge/tests/test_po_merge.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/po_merge/tests/test_po_merge.py	2022-10-27 08:09:03 +0000
@@ -152,7 +152,7 @@
 # beginning of the file.
 
 _Adduser = dict(
-    base_pot=osutils.safe_utf8(r"""# SOME DESCRIPTIVE TITLE.
+    base_pot=br"""# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -179,8 +179,8 @@
 msgid "Warning: The home dir you specified already exists.\n"
 msgstr ""
 
-"""),
-    this_pot=osutils.safe_utf8(r"""# SOME DESCRIPTIVE TITLE.
+""",
+    this_pot=br"""# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -214,8 +214,8 @@
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 
-"""),
-    other_pot=osutils.safe_utf8(r"""# SOME DESCRIPTIVE TITLE.
+""",
+    other_pot=br"""# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -249,8 +249,8 @@
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 
-"""),
-    resolved_pot=osutils.safe_utf8(r"""# SOME DESCRIPTIVE TITLE.
+""",
+    resolved_pot=br"""# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -284,8 +284,8 @@
 msgid "Warning: The home dir %s you specified can't be accessed: %s\n"
 msgstr ""
 
-"""),
-    base_po=osutils.safe_utf8(r"""# adduser's manpages translation to French
+""",
+    base_po=br"""# adduser's manpages translation to French
 # Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the adduser package
 #
@@ -320,8 +320,8 @@
 msgstr ""
 "Attention ! Le répertoire personnel que vous avez indiqué existe déjà.\n"
 
-"""),
-    this_po=osutils.safe_utf8(r"""# adduser's manpages translation to French
+""",
+    this_po=br"""# adduser's manpages translation to French
 # Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the adduser package
 #
@@ -363,8 +363,8 @@
 msgstr ""
 "Attention ! Le répertoire personnel que vous avez indiqué existe déjà.\n"
 
-"""),
-    other_po=osutils.safe_utf8(r"""# adduser's manpages translation to French
+""",
+    other_po=br"""# adduser's manpages translation to French
 # Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the adduser package
 #
@@ -406,8 +406,8 @@
 "Attention ! Impossible d'accéder au répertoire personnel que vous avez "
 "indiqué (%s) : %s.\n"
 
-"""),
-    resolved_po=osutils.safe_utf8(r"""# adduser's manpages translation to French
+""",
+    resolved_po=br"""# adduser's manpages translation to French
 # Copyright (C) 2004 Software in the Public Interest
 # This file is distributed under the same license as the adduser package
 #
@@ -449,5 +449,5 @@
 "Attention ! Impossible d'accéder au répertoire personnel que vous avez "
 "indiqué (%s) : %s.\n"
 
-"""),
+""",
 )

=== modified file 'breezy/plugins/weave_fmt/repository.py'
--- breezy/plugins/weave_fmt/repository.py	2022-08-22 18:19:46 +0000
+++ breezy/plugins/weave_fmt/repository.py	2022-10-27 08:09:03 +0000
@@ -88,7 +88,7 @@
             file_or_path = '/'.join(file_or_path)
         if file_or_path == '':
             return u''
-        return urlutils.escape(osutils.safe_unicode(file_or_path))
+        return urlutils.escape(file_or_path)
 
     def __init__(self, _format, a_controldir):
         # we reuse one control files instance.

=== modified file 'breezy/smtp_connection.py'
--- breezy/smtp_connection.py	2021-11-15 16:36:47 +0000
+++ breezy/smtp_connection.py	2022-10-27 08:09:03 +0000
@@ -157,14 +157,7 @@
             self._smtp_password = auth.get_password(
                 'smtp', self._smtp_server, self._smtp_username)
 
-        # smtplib requires that the username and password be byte
-        # strings.  The CRAM-MD5 spec doesn't give any guidance on
-        # encodings, but the SASL PLAIN spec says UTF-8, so that's
-        # what we'll use.
-        username = osutils.safe_utf8(self._smtp_username)
-        password = osutils.safe_utf8(self._smtp_password)
-
-        self._connection.login(username, password)
+        self._connection.login(self._smtp_username, self._smtp_password)
 
     @staticmethod
     def get_message_addresses(message):

=== modified file 'breezy/tests/blackbox/test_export.py'
--- breezy/tests/blackbox/test_export.py	2022-05-03 20:36:36 +0000
+++ breezy/tests/blackbox/test_export.py	2022-10-27 08:09:03 +0000
@@ -111,10 +111,17 @@
         tree.commit('first')
 
         self.run_bzr('export test.tar -d tar')
+<<<<<<< TREE
         with tarfile.open('test.tar') as ball:
             # all paths are prefixed with the base name of the tarball
             self.assertEqual([u'test/' + fname],
                              [osutils.safe_unicode(n) for n in ball.getnames()])
+=======
+        ball = tarfile.open('test.tar')
+        # all paths are prefixed with the base name of the tarball
+        self.assertEqual([u'test/' + fname],
+                         [n for n in ball.getnames()])
+>>>>>>> MERGE-SOURCE
 
     def test_tar_export_unicode_basedir(self):
         """Test for bug #413406"""

=== modified file 'breezy/tests/test_email_message.py'
--- breezy/tests/test_email_message.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_email_message.py	2022-10-27 08:09:03 +0000
@@ -19,7 +19,6 @@
 
 from .. import __version__ as _breezy_version
 from ..email_message import EmailMessage
-from ..errors import BzrBadParameterNotUnicode
 from ..smtp_connection import SMTPConnection
 from .. import tests
 
@@ -133,7 +132,7 @@
         for i in range(3):  # from_address, to_address, subject
             x = [b'"J. Random Developer" <[e-mail]>'] * 3
             x[i] = b'Pepe P\xe9rez <[e-mail]>'
-            self.assertRaises(BzrBadParameterNotUnicode, EmailMessage, *x)
+            self.assertRaises(TypeError, EmailMessage, *x)
 
     def test_multiple_destinations(self):
         to_addresses = ['[e-mail]', '[e-mail]', '[e-mail]']
@@ -183,7 +182,7 @@
         self.assertEqual(address, decode(encoded))
 
         address = b'Pepe P\xe9rez <[e-mail]>'  # ISO-8859-1 not ok
-        self.assertRaises(BzrBadParameterNotUnicode,
+        self.assertRaises(TypeError,
                           EmailMessage.address_to_encoded_header, address)
 
     def test_string_with_encoding(self):

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2022-09-23 07:44:01 +0000
+++ breezy/tests/test_osutils.py	2022-10-27 08:09:03 +0000
@@ -775,46 +775,6 @@
                           osutils.relpath, 'C:/', 'H:/path')
 
 
-class TestSafeUnicode(tests.TestCase):
-
-    def test_from_ascii_string(self):
-        self.assertEqual(u'foobar', osutils.safe_unicode(b'foobar'))
-
-    def test_from_unicode_string_ascii_contents(self):
-        self.assertEqual(u'bargam', osutils.safe_unicode(u'bargam'))
-
-    def test_from_unicode_string_unicode_contents(self):
-        self.assertEqual(u'bargam\xae', osutils.safe_unicode(u'bargam\xae'))
-
-    def test_from_utf8_string(self):
-        self.assertEqual(u'foo\xae', osutils.safe_unicode(b'foo\xc2\xae'))
-
-    def test_bad_utf8_string(self):
-        self.assertRaises(errors.BzrBadParameterNotUnicode,
-                          osutils.safe_unicode,
-                          b'\xbb\xbb')
-
-
-class TestSafeUtf8(tests.TestCase):
-
-    def test_from_ascii_string(self):
-        f = b'foobar'
-        self.assertEqual(b'foobar', osutils.safe_utf8(f))
-
-    def test_from_unicode_string_ascii_contents(self):
-        self.assertEqual(b'bargam', osutils.safe_utf8(u'bargam'))
-
-    def test_from_unicode_string_unicode_contents(self):
-        self.assertEqual(b'bargam\xc2\xae', osutils.safe_utf8(u'bargam\xae'))
-
-    def test_from_utf8_string(self):
-        self.assertEqual(b'foo\xc2\xae', osutils.safe_utf8(b'foo\xc2\xae'))
-
-    def test_bad_utf8_string(self):
-        self.assertRaises(errors.BzrBadParameterNotUnicode,
-                          osutils.safe_utf8, b'\xbb\xbb')
-
-
 class TestSendAll(tests.TestCase):
 
     def test_send_with_disconnected_socket(self):
@@ -1129,7 +1089,7 @@
         # (It would be ok if it happened earlier but at the moment it
         # doesn't.)
         e = self.assertRaises(OSError, list, osutils._walkdirs_utf8("."))
-        self.assertEqual('./test-unreadable', osutils.safe_unicode(e.filename))
+        self.assertEqual(b'./test-unreadable', e.filename)
         self.assertEqual(errno.EACCES, e.errno)
         # Ensure the message contains the file name
         self.assertContainsRe(str(e), "\\./test-unreadable")
@@ -1202,7 +1162,7 @@
                 found_bzrdir = True
                 del dirblock[0]
             dirdetail = (dirdetail[0].decode('utf-8'),
-                         osutils.safe_unicode(dirdetail[1]))
+                         dirdetail[1])
             dirblock = [
                 (entry[0].decode('utf-8'), entry[1].decode('utf-8'), entry[2])
                 for entry in dirblock]

=== modified file 'breezy/tests/test_smtp_connection.py'
--- breezy/tests/test_smtp_connection.py	2021-11-15 16:36:47 +0000
+++ breezy/tests/test_smtp_connection.py	2022-10-27 08:09:03 +0000
@@ -156,22 +156,24 @@
         self.assertEqual(password, conn._smtp_password)
 
     def test_authenticate_with_byte_strings(self):
-        user = b'joe'
+        unicode_user = 'joe'
         unicode_pass = u'h\xECspass'
+        utf8_user = unicode_user.encode('utf-8')
         utf8_pass = unicode_pass.encode('utf-8')
         factory = WideOpenSMTPFactory()
         conn = self.get_connection(
             b'[DEFAULT]\nsmtp_username=%s\nsmtp_password=%s\n'
-            % (user, utf8_pass), smtp_factory=factory)
+            % (utf8_user, utf8_pass), smtp_factory=factory)
         self.assertEqual(unicode_pass, conn._smtp_password)
         conn._connect()
         self.assertEqual([('connect', 'localhost'),
                           ('ehlo',),
                           ('has_extn', 'starttls'),
-                          ('login', user, utf8_pass)], factory._calls)
+                          ('login', unicode_user, unicode_pass)],
+                          factory._calls)
         smtp_username, smtp_password = factory._calls[-1][1:]
-        self.assertIsInstance(smtp_username, bytes)
-        self.assertIsInstance(smtp_password, bytes)
+        self.assertIsInstance(smtp_username, str)
+        self.assertIsInstance(smtp_password, str)
 
     def test_create_connection(self):
         factory = StubSMTPFactory()

=== modified file 'breezy/utextwrap.py'
--- breezy/utextwrap.py	2020-02-18 01:57:45 +0000
+++ breezy/utextwrap.py	2022-10-27 08:09:03 +0000
@@ -249,7 +249,7 @@
         return lines
 
     def _split(self, text):
-        chunks = textwrap.TextWrapper._split(self, osutils.safe_unicode(text))
+        chunks = textwrap.TextWrapper._split(self, text)
         cjk_split_chunks = []
         for chunk in chunks:
             prev_pos = 0
@@ -265,7 +265,7 @@
 
     def wrap(self, text):
         # ensure text is unicode
-        return textwrap.TextWrapper.wrap(self, osutils.safe_unicode(text))
+        return textwrap.TextWrapper.wrap(self, text)
 
 # -- Convenience interface ---------------------------------------------
 

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2022-08-22 18:19:46 +0000
+++ breezy/workingtree.py	2022-10-27 08:09:03 +0000
@@ -109,7 +109,6 @@
         if not _internal:
             raise errors.BzrError("Please use controldir.open_workingtree or "
                                   "WorkingTree.open() to obtain a WorkingTree.")
-        basedir = osutils.safe_unicode(basedir)
         mutter("opening working tree %r", basedir)
         if branch is not None:
             self._branch = branch