/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/per_branch/test_branch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
    branch as _mod_bzrbranch,
41
41
    remote,
42
42
    )
43
 
from breezy.sixish import (
44
 
    text_type,
45
 
    )
46
43
from breezy.tests import (
47
44
    per_branch,
48
45
    )
292
289
        branch = self.make_branch('bzr.dev')
293
290
        # An implicit nick name is set; what it is exactly depends on the
294
291
        # format.
295
 
        self.assertIsInstance(branch.nick, text_type)
 
292
        self.assertIsInstance(branch.nick, str)
296
293
        # Set the branch nick explicitly.
297
294
        branch.nick = u"Aaron's branch"
298
295
        # Because the nick has been set explicitly, the nick is now always