/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-31 21:08:52 UTC
  • mfrom: (5743.12.19 config-options)
  • mto: This revision was merged to the branch mainline in revision 5945.
  • Revision ID: v.ladeuil+lp@free.fr-20110531210852-0uyfsjkws5zbfs8m
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
74
74
            password = urllib.unquote(password)
75
75
        else:
76
76
            password = ui.ui_factory.get_password(
77
 
                prompt='HTTP %(user)s@%(host)s password',
 
77
                prompt=u'HTTP %(user)s@%(host)s password',
78
78
                user=username, host=host)
79
79
        password_manager.add_password(None, host, username, password)
80
80
    url = urlparse.urlunsplit((scheme, netloc, path, query, fragment))