← 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: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
19
19
There are separate implementation modules for each http client implementation.
20
20
"""
21
21
 
 
22
from __future__ import absolute_import
 
23
 
22
24
from cStringIO import StringIO
23
25
import re
24
26
import urlparse
25
 
import urllib
26
27
import sys
27
28
import weakref
28
29
 
63
64
            host = netloc.split(':', 1)[0]
64
65
        else:
65
66
            host = netloc
66
 
        username = urllib.unquote(username)
 
67
        username = urlutils.unquote(username)
67
68
        if password is not None:
68
 
            password = urllib.unquote(password)
 
69
            password = urlutils.unquote(password)
69
70
        else:
70
71
            password = ui.ui_factory.get_password(
71
72
                prompt=u'HTTP %(user)s@%(host)s password',
589
590
        if transport_base.startswith('bzr+'):
590
591
            transport_base = transport_base[4:]
591
592
        rel_url = urlutils.relative_url(self.base, transport_base)
592
 
        return urllib.unquote(rel_url)
 
593
        return urlutils.unquote(rel_url)
593
594
 
594
595
    def send_http_smart_request(self, bytes):
595
596
        try: