← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
30
30
import os
31
31
import sys
32
32
import time
33
 
import urllib
34
33
 
35
34
import bzrlib
36
35
from bzrlib.lazy_import import lazy_import
842
841
        """
843
842
        medium_base = urlutils.join(self.base, '/')
844
843
        rel_url = urlutils.relative_url(medium_base, transport.base)
845
 
        return urllib.unquote(rel_url)
 
844
        return urlutils.unquote(rel_url)
846
845
 
847
846
 
848
847
class SmartClientStreamMedium(SmartClientMedium):