/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/git/workingtree.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:
73
73
    BadReferenceTarget,
74
74
    MutableTree,
75
75
    )
76
 
from ..sixish import text_type
77
76
 
78
77
 
79
78
from .dir import (
534
533
                              recurse_nested=False):
535
534
        if from_dir is None:
536
535
            from_dir = u""
537
 
        if not isinstance(from_dir, text_type):
 
536
        if not isinstance(from_dir, str):
538
537
            raise TypeError(from_dir)
539
538
        encoded_from_dir = self.abspath(from_dir).encode(osutils._fs_enc)
540
539
        for (dirpath, dirnames, filenames) in os.walk(encoded_from_dir):