← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
96
96
    def abspath(self, relpath):
97
97
        """Return the full url to the given relative URL."""
98
98
        # TODO: url escape the result. RBC 20060523.
99
 
        assert isinstance(relpath, basestring), (type(relpath), relpath)
100
99
        # jam 20060426 Using normpath on the real path, because that ensures
101
100
        #       proper handling of stuff like
102
101
        path = osutils.normpath(osutils.pathjoin(
511
510
        self._local_base = urlutils._win32_local_path_from_url(base)
512
511
 
513
512
    def abspath(self, relpath):
514
 
        assert isinstance(relpath, basestring), (type(relpath), relpath)
515
513
        path = osutils.normpath(osutils.pathjoin(
516
514
                    self._local_base, urlutils.unescape(relpath)))
517
515
        return urlutils._win32_local_path_to_url(path)