← 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: 2011-10-06 08:09:14 UTC
  • mfrom: (6191.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111006080914-364iz1580zxvpxtm
(vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)

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: