← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert J. Tanner
  • Date: 2009-04-30 22:40:42 UTC
  • mfrom: (4323 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4324.
  • Revision ID: tanner@real-time.com-20090430224042-53v45axtue5bw45l
Merge 1.14.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/__init__.py
129
129
 
130
130
        auth = config.AuthenticationConfig()
131
131
        if user is None:
132
 
            user = auth.get_user('ftp', self._host, port=self._port)
133
 
            if user is None:
134
 
                # Default to local user
135
 
                user = getpass.getuser()
136
 
 
 
132
            user = auth.get_user('ftp', self._host, port=self._port,
 
133
                                 default=getpass.getuser())
137
134
        mutter("Constructing FTP instance against %r" %
138
135
               ((self._host, self._port, user, '********',
139
136
                self.is_active),))