← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.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/transport/http/__init__.py
24
24
from cStringIO import StringIO
25
25
import re
26
26
import urlparse
27
 
import urllib
28
27
import sys
29
28
import weakref
30
29
 
65
64
            host = netloc.split(':', 1)[0]
66
65
        else:
67
66
            host = netloc
68
 
        username = urllib.unquote(username)
 
67
        username = urlutils.unquote(username)
69
68
        if password is not None:
70
 
            password = urllib.unquote(password)
 
69
            password = urlutils.unquote(password)
71
70
        else:
72
71
            password = ui.ui_factory.get_password(
73
72
                prompt=u'HTTP %(user)s@%(host)s password',
591
590
        if transport_base.startswith('bzr+'):
592
591
            transport_base = transport_base[4:]
593
592
        rel_url = urlutils.relative_url(self.base, transport_base)
594
 
        return urllib.unquote(rel_url)
 
593
        return urlutils.unquote(rel_url)
595
594
 
596
595
    def send_http_smart_request(self, bytes):
597
596
        try: