← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-12 13:04:56 UTC
  • mto: (5268.8.2 switch-colocated)
  • mto: This revision was merged to the branch mainline in revision 6079.
  • Revision ID: jelmer@samba.org-20110812130456-66qle1zx44c66ilc
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
1335
1335
            self._parsed_url.quoted_password = (
1336
1336
                _from_transport._parsed_url.quoted_password)
1337
1337
 
1338
 
        base = self._unsplit_url(self._parsed_url.scheme,
1339
 
            self._parsed_url.user, self._parsed_url.password,
1340
 
            self._parsed_url.host, self._parsed_url.port,
1341
 
            self._parsed_url.path)
 
1338
        base = str(self._parsed_url)
1342
1339
 
1343
1340
        super(ConnectedTransport, self).__init__(base)
1344
1341
        if _from_transport is None:
1440
1437
 
1441
1438
        :returns: the Unicode version of the absolute path for relpath.
1442
1439
        """
1443
 
        other = self._parsed_url.clone(relpath)
1444
 
        return self._unsplit_url(other.scheme, other.user, other.password,
1445
 
            other.host, other.port, other.path)
 
1440
        return str(self._parsed_url.clone(relpath))
1446
1441
 
1447
1442
    def _remote_path(self, relpath):
1448
1443
        """Return the absolute path part of the url to the given relative path.