← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/stub_sftp.py

  • Committer: Patch Queue Manager
  • Date: 2014-09-22 19:42:30 UTC
  • mfrom: (6597.2.1 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20140922194230-y32j0sq621bxhp7c
(richard-wilbur) Split diff format option parser into a separate function,
 update to include all format options for GNU diff v3.2,
 and test parser.  Fixes lp:1370435 (Richard Wilbur)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/stub_sftp.py
118
118
    else:
119
119
        def canonicalize(self, path):
120
120
            if os.path.isabs(path):
121
 
                return os.path.normpath(path)
 
121
                return osutils.normpath(path)
122
122
            else:
123
 
                return os.path.normpath('/' + os.path.join(self.home, path))
 
123
                return osutils.normpath('/' + os.path.join(self.home, path))
124
124
 
125
125
    def chattr(self, path, attr):
126
126
        try:
553
553
 
554
554
    def get_url(self):
555
555
        """See bzrlib.transport.Server.get_url."""
556
 
        return self._get_sftp_url("~/")
 
556
        return self._get_sftp_url("%7E/")
557
557
 
558
558
 
559
559
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):