← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ftp_transport.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ftp_transport.py
16
16
 
17
17
import ftplib
18
18
import getpass
19
 
import urllib
20
19
 
21
20
from bzrlib import (
22
21
    config,
24
23
    tests,
25
24
    transport,
26
25
    ui,
 
26
    urlutils,
27
27
    )
28
28
 
29
29
from bzrlib.transport import ftp
85
85
        parsed_url = transport.ConnectedTransport._split_url(base)
86
86
        new_url = parsed_url.clone()
87
87
        new_url.user = self.user
88
 
        new_url.quoted_user = urllib.quote(self.user)
 
88
        new_url.quoted_user = urlutils.quote(self.user)
89
89
        new_url.password = self.password
90
 
        new_url.quoted_password = urllib.quote(self.password)
 
90
        new_url.quoted_password = urlutils.quote(self.password)
91
91
        return str(new_url)
92
92
 
93
93
    def test_no_prompt_for_username(self):