← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/client.py

  • Committer: Andrew Bennetts
  • Date: 2008-04-03 14:02:59 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080403140259-83o949yopz03r40j
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/client.py
87
87
        the medium from the matching transport.
88
88
        """
89
89
        base = self._base
90
 
        if base.startswith('bzr+http://') or base.startswith('bzr+https://'):
 
90
        if (base.startswith('bzr+http://') or base.startswith('bzr+https://')
 
91
            or base.startswith('http://') or base.startswith('https://')):
91
92
            medium_base = self._base
92
93
        else:
93
94
            medium_base = urlutils.join(self._base, '/')