← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:25:16 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201172516-5232226cd9ec1f0e
A couple more path.join statements needed changing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
28
28
from bzrlib.trace import mutter
29
29
from bzrlib.transport import Transport, register_transport, \
30
30
    TransportError, NoSuchFile, FileExists
31
 
from bzrlib.osutils import abspath
 
31
from bzrlib.osutils import abspath, realpath, pathjoin
32
32
 
33
33
class LocalTransportError(TransportError):
34
34
    pass
64
64
        This can be supplied with a string or a list
65
65
        """
66
66
        assert isinstance(relpath, basestring), (type(relpath), relpath)
67
 
        return os.path.join(self.base, urllib.unquote(relpath))
 
67
        return pathjoin(self.base, urllib.unquote(relpath))
68
68
 
69
69
    def relpath(self, abspath):
70
70
        """Return the local path portion from a given absolute path.