← 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: Canonical.com Patch Queue Manager
  • Date: 2011-08-12 01:42:55 UTC
  • mfrom: (6055.2.12 unparsedurl)
  • Revision ID: pqm@pqm.ubuntu.com-20110812014255-y3thbw6gdn7cw6uz
(jelmer) Add a URL object for manipulating parsed URLs. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ftp_transport.py
81
81
    def get_url(self, relpath=None):
82
82
        """Overrides get_url to inject our user."""
83
83
        base = super(TestFTPTestServerUI, self).get_url(relpath)
84
 
        (scheme, user, password,
85
 
         host, port, path) = transport.ConnectedTransport._split_url(base)
 
84
        parsed_url = transport.ConnectedTransport._split_url(base)
86
85
        url = transport.ConnectedTransport._unsplit_url(
87
 
            scheme, self.user, self.password, host, port, path)
 
86
            parsed_url.scheme, self.user, self.password, parsed_url.host,
 
87
            parsed_url.port, parsed_url.path)
88
88
        return url
89
89
 
90
90
    def test_no_prompt_for_username(self):