← 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: Aaron Bentley
  • Date: 2006-12-10 18:46:53 UTC
  • mfrom: (2167 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061210184653-qg4kra59ky1gbgyk
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
25
25
import urlparse
26
26
import urllib
27
27
 
28
 
from bzrlib import errors
 
28
from bzrlib import errors, ui
29
29
from bzrlib.trace import mutter
30
30
from bzrlib.transport import (
31
31
    smart,
32
32
    Transport,
33
33
    )
34
 
from bzrlib.ui import ui_factory
35
34
 
36
35
 
37
36
# TODO: This is not used anymore by HttpTransport_urllib
61
60
        if password is not None:
62
61
            password = urllib.unquote(password)
63
62
        else:
64
 
            password = ui_factory.get_password(
 
63
            password = ui.ui_factory.get_password(
65
64
                prompt='HTTP %(user)s@%(host)s password',
66
65
                user=username, host=host)
67
66
        password_manager.add_password(None, host, username, password)