← 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: John Arbash Meinel
  • Date: 2006-11-10 21:06:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061110210611-ee346404477ecb86
Fix imports to ensure modules are loaded before they are used

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
34
34
import BaseHTTPServer, SimpleHTTPServer, socket, time
35
35
import threading
36
36
 
37
 
from bzrlib import errors
 
37
from bzrlib import errors, ui
38
38
from bzrlib.errors import (TransportNotPossible, NoSuchFile,
39
39
                           TransportError, ConnectionError, InvalidURL)
40
40
from bzrlib.branch import Branch
48
48
    )
49
49
from bzrlib.transport.http.response import (HttpMultipartRangeResponse,
50
50
                                            HttpRangeResponse)
51
 
from bzrlib.ui import ui_factory
52
51
 
53
52
 
54
53
def extract_auth(url, password_manager):
74
73
        if password is not None:
75
74
            password = urllib.unquote(password)
76
75
        else:
77
 
            password = ui_factory.get_password(prompt='HTTP %(user)@%(host) password',
 
76
            password = ui.ui_factory.get_password(prompt='HTTP %(user)@%(host) password',
78
77
                                               user=username, host=host)
79
78
        password_manager.add_password(None, host, username, password)
80
79
    url = urlparse.urlunsplit((scheme, netloc, path, query, fragment))